diff options
Diffstat (limited to 'recipes/feh')
-rw-r--r-- | recipes/feh/feh-1.2.6/cross.patch | 31 | ||||
-rw-r--r-- | recipes/feh/feh-1.2.7/cross.patch | 39 | ||||
-rw-r--r-- | recipes/feh/feh_1.2.6.bb | 10 | ||||
-rw-r--r-- | recipes/feh/feh_1.2.7.bb | 10 |
4 files changed, 90 insertions, 0 deletions
diff --git a/recipes/feh/feh-1.2.6/cross.patch b/recipes/feh/feh-1.2.6/cross.patch new file mode 100644 index 0000000000..0117ced81d --- /dev/null +++ b/recipes/feh/feh-1.2.6/cross.patch @@ -0,0 +1,31 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- feh-1.2.6/./src/Makefile.am~cross ++++ feh-1.2.6/./src/Makefile.am +@@ -2,8 +2,7 @@ + MAINTAINERCLEANFILES = Makefile.in + + LDFLAGS = -L/usr/X11R6/lib +-INCLUDES = -I/usr/X11R6/include $(X_CFLAGS) \ +- -I$(prefix)/include -I$(includedir) \ ++INCLUDES = $(X_CFLAGS) \ + -I. -I$(top_srcdir)/src \ + -DPREFIX=\""$(prefix)"\" \ + @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@ +--- feh-1.2.6/./Makefile.am~cross ++++ feh-1.2.6/./Makefile.am +@@ -5,9 +5,8 @@ + # A list of all the files in the current directory which can be regenerated + MAINTAINERCLEANFILES = Makefile.in feh.spec + +-LDFLAGS = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib +-INCLUDES = -I/usr/X11R6/include \ +-$(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. ++LDFLAGS = -L/usr/X11R6/lib ++INCLUDES = $(X_CFLAGS) -I. + + man_MANS = feh.1 + diff --git a/recipes/feh/feh-1.2.7/cross.patch b/recipes/feh/feh-1.2.7/cross.patch new file mode 100644 index 0000000000..250b1b4d9f --- /dev/null +++ b/recipes/feh/feh-1.2.7/cross.patch @@ -0,0 +1,39 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: feh-1.2.7/Makefile.am +=================================================================== +--- feh-1.2.7.orig/Makefile.am 2004-09-03 15:30:58.000000000 -0400 ++++ feh-1.2.7/Makefile.am 2005-03-12 19:20:36.020740008 -0500 +@@ -5,9 +5,8 @@ + # A list of all the files in the current directory which can be regenerated + MAINTAINERCLEANFILES = Makefile.in feh.spec + +-LDFLAGS = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib +-INCLUDES = -I/usr/X11R6/include \ +-$(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. ++LDFLAGS = -L/usr/X11R6/lib ++INCLUDES = $(X_CFLAGS) -I. + + man_MANS = feh.1 + +Index: feh-1.2.7/src/Makefile.am +=================================================================== +--- feh-1.2.7.orig/src/Makefile.am 2004-09-04 10:19:16.000000000 -0400 ++++ feh-1.2.7/src/Makefile.am 2005-03-12 19:21:22.806627472 -0500 +@@ -1,11 +1,9 @@ + # A list of all the files in the current directory which can be regenerated + MAINTAINERCLEANFILES = Makefile.in + +-LDFLAGS = -L/usr/X11R6/lib -L/usr/local/lib -lpng +-INCLUDES = -I/usr/X11R6/include $(X_CFLAGS) \ +- -I$(prefix)/include -I$(includedir) \ ++LDFLAGS = -lpng ++INCLUDES = $(X_CFLAGS) \ + -I. -I$(top_srcdir)/src \ +- -I/usr/local/include/libpng \ + -DPREFIX=\""$(prefix)"\" \ + @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@ + LIBOBJS = @LIBOBJS@ diff --git a/recipes/feh/feh_1.2.6.bb b/recipes/feh/feh_1.2.6.bb new file mode 100644 index 0000000000..1e0f0e4684 --- /dev/null +++ b/recipes/feh/feh_1.2.6.bb @@ -0,0 +1,10 @@ +SECTION = "x11/utils" +DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2." +LICENSE = "MIT" +DEPENDS = "virtual/imlib2 giblib jpeg virtual/libx11 libxext libxt" + +SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \ + file://cross.patch;patch=1" +S = "${WORKDIR}/feh-${PV}" + +inherit autotools diff --git a/recipes/feh/feh_1.2.7.bb b/recipes/feh/feh_1.2.7.bb new file mode 100644 index 0000000000..1e0f0e4684 --- /dev/null +++ b/recipes/feh/feh_1.2.7.bb @@ -0,0 +1,10 @@ +SECTION = "x11/utils" +DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2." +LICENSE = "MIT" +DEPENDS = "virtual/imlib2 giblib jpeg virtual/libx11 libxext libxt" + +SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \ + file://cross.patch;patch=1" +S = "${WORKDIR}/feh-${PV}" + +inherit autotools |