diff options
5 files changed, 0 insertions, 189 deletions
diff --git a/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch b/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch deleted file mode 100644 index e8a1fd0f..00000000 --- a/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f064b60df5ebf11a0d3e0ed632a6b989690773f6 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Mon, 21 Feb 2022 22:32:54 +0100 -Subject: [PATCH] pkgconfig: don't include ldflags - -This leaks the cross build environment. -Prevents: -| ERROR: giblib-1.2.4-r0 do_populate_sysroot: QA Issue: giblib.pc failed sanity test (tmpdir) in path ../giblib/1.2.4-r0/sysroot-destdir/usr/lib/ pkgconfig [pkgconfig] - -Upstream-Status: Pending -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - giblib.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/giblib.pc.in b/giblib.pc.in -index df520ae..3049603 100644 ---- a/giblib.pc.in -+++ b/giblib.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: giblib - Description: wrapper library for imlib2, and other stuff - Version: @VERSION@ --Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB_LIBS@ -+Libs: -L${libdir} -lgiblib @IMLIB_LIBS@ - Cflags: -I${includedir} -I${includedir}/giblib @IMLIB_CFLAGS@ - --- -2.20.1 - diff --git a/recipes-graphics/scrot/files/fix-giblib-binconfig-paths.patch b/recipes-graphics/scrot/files/fix-giblib-binconfig-paths.patch deleted file mode 100644 index c28c4e36..00000000 --- a/recipes-graphics/scrot/files/fix-giblib-binconfig-paths.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstream-Status: Pending ---- giblib-1.2.4/giblib-config.in~ 2004-09-04 16:40:40.000000000 +0200 -+++ giblib-1.2.4/giblib-config.in 2013-04-24 23:15:55.972080028 +0200 -@@ -42,10 +42,10 @@ - if test @includedir@ != /usr/include ; then - includes=-I@includedir@ - fi -- echo $includes -I$prefix/include/giblib @IMLIB_CFLAGS@ -+ echo @IMLIB_CFLAGS@ - ;; - --libs) -- libdirs=-L@libdir@ -+ libdirs= - echo $libdirs -lgiblib @LDFLAGS@ @IMLIB_LIBS@ - ;; - *) diff --git a/recipes-graphics/scrot/files/fix-scrot-include-paths.patch b/recipes-graphics/scrot/files/fix-scrot-include-paths.patch deleted file mode 100644 index b26a05b9..00000000 --- a/recipes-graphics/scrot/files/fix-scrot-include-paths.patch +++ /dev/null @@ -1,77 +0,0 @@ -Upstream-Status: Pending -diff -Naur scrot-0.8.orig/Makefile.am scrot-0.8/Makefile.am ---- scrot-0.8.orig/Makefile.am 2000-10-29 02:44:22.000000000 +0200 -+++ scrot-0.8/Makefile.am 2013-04-24 23:31:31.501090024 +0200 -@@ -5,9 +5,8 @@ - # A list of all the files in the current directory which can be regenerated - MAINTAINERCLEANFILES = Makefile.in scrot.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 = -+INCLUDES = $(X_CFLAGS) -I. - - man_MANS = scrot.1 - -diff -Naur scrot-0.8.orig/Makefile.in scrot-0.8/Makefile.in ---- scrot-0.8.orig/Makefile.in 2003-06-23 14:13:33.000000000 +0200 -+++ scrot-0.8/Makefile.in 2013-04-24 23:32:41.582090775 +0200 -@@ -30,7 +30,7 @@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ --oldincludedir = /usr/include -+oldincludedir = - - DESTDIR = - -@@ -75,8 +75,8 @@ - # A list of all the files in the current directory which can be regenerated - MAINTAINERCLEANFILES = Makefile.in scrot.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 = -+INCLUDES = $(X_CFLAGS) -I. - - - man_MANS = scrot.1 -diff -Naur scrot-0.8.orig/src/Makefile.am scrot-0.8/src/Makefile.am ---- scrot-0.8.orig/src/Makefile.am 2001-08-29 20:55:04.000000000 +0200 -+++ scrot-0.8/src/Makefile.am 2013-04-24 23:35:08.237092341 +0200 -@@ -1,9 +1,8 @@ - # A list of all the files in the current directory which can be regenerated - MAINTAINERCLEANFILES = Makefile.in - --LDFLAGS = -L/usr/X11R6/lib --INCLUDES = -g -O3 -Wall -I/usr/X11R6/include \ --$(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. \ -+LDFLAGS = -+INCLUDES = -g -O3 -Wall $(X_CFLAGS) -I. \ - -DPREFIX=\""$(prefix)"\" @GIBLIB_CFLAGS@ - LIBOBJS = @LIBOBJS@ - -diff -Naur scrot-0.8.orig/src/Makefile.in scrot-0.8/src/Makefile.in ---- scrot-0.8.orig/src/Makefile.in 2003-06-23 14:13:34.000000000 +0200 -+++ scrot-0.8/src/Makefile.in 2013-04-24 23:34:43.070092077 +0200 -@@ -32,7 +32,7 @@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ --oldincludedir = /usr/include -+oldincludedir = - - DESTDIR = - -@@ -73,8 +73,8 @@ - - MAINTAINERCLEANFILES = Makefile.in - --LDFLAGS = -L/usr/X11R6/lib --INCLUDES = -g -O3 -Wall -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -DPREFIX=\""$(prefix)"\" @GIBLIB_CFLAGS@ -+LDFLAGS = -+INCLUDES = -g -O3 -Wall $(X_CFLAGS) -I. -DPREFIX=\""$(prefix)"\" @GIBLIB_CFLAGS@ - - LIBOBJS = @LIBOBJS@ - diff --git a/recipes-graphics/scrot/giblib_1.2.4.bb b/recipes-graphics/scrot/giblib_1.2.4.bb deleted file mode 100644 index 4dac98c2..00000000 --- a/recipes-graphics/scrot/giblib_1.2.4.bb +++ /dev/null @@ -1,40 +0,0 @@ -SECTION = "graphic/utils" -SUMMARY = "giblib is a simple library which wraps imlib2" -HOMEPAGE = "http://linuxbrit.co.uk/software/" -LICENSE = "MIT-feh" - -DEPENDS = "imlib2" - -MIRRORS:prepend () { -} - -SRC_URI = " \ - https://pkgs.fedoraproject.org/repo/pkgs/giblib/giblib-${PV}.tar.gz/c810ef5389baf24882a1caca2954385e/giblib-${PV}.tar.gz \ - file://fix-giblib-binconfig-paths.patch \ - file://0001-pkgconfig-don-t-include-ldflags.patch \ -" -LIC_FILES_CHKSUM = "file://COPYING;md5=dd3cb8d7a69f3d0b2a52a46c92389011" -SRC_URI[md5sum] = "c810ef5389baf24882a1caca2954385e" -SRC_URI[sha256sum] = "176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922ebaa8bac" - -PR = "r0" - -do_compile:prepend () { - #remove linkerpath to host libraries - sed -i -e 's:-L/usr/lib\s::' Makefile - sed -i -e 's:-L/usr/lib\s::' giblib/Makefile - export DESTDIR=${D} -} - -do_compile:append () { - for i in $(find ${B} -name "*?.pc") ; do - sed -i -e s:${STAGING_DIR_TARGET}::g \ - -e s:/${TARGET_SYS}::g \ - $i - done -} - -FILES:${PN}-doc = "/usr/doc" - -inherit autotools-brokensep binconfig pkgconfig - diff --git a/recipes-graphics/scrot/scrot_0.8.bb b/recipes-graphics/scrot/scrot_0.8.bb deleted file mode 100644 index e3946589..00000000 --- a/recipes-graphics/scrot/scrot_0.8.bb +++ /dev/null @@ -1,26 +0,0 @@ -SECTION = "graphic/utils" -SUMMARY = "scrot (SCReen shOT), screen capture utility" -DESCRIPTION = "scrot (SCReen shOT) is a simple commandline screen capture utility that uses imlib2 to grab and save images" -HOMEPAGE = "http://linuxbrit.co.uk/software/" -LICENSE = "MIT-feh" - -RDEPENDS:${PN} = "imlib2-loaders" -DEPENDS = "imlib2 giblib" - -MIRRORS:prepend () { -} - -SRC_URI = " \ - https://pkgs.fedoraproject.org/repo/pkgs/scrot/scrot-${PV}.tar.gz/ccae904d225609571bdd3b03445c1e88/scrot-${PV}.tar.gz \ - file://fix-scrot-include-paths.patch \ -" -LIC_FILES_CHKSUM = "file://COPYING;md5=dd3cb8d7a69f3d0b2a52a46c92389011" -SRC_URI[md5sum] = "ccae904d225609571bdd3b03445c1e88" -SRC_URI[sha256sum] = "613d1cf524c2b62ce3c65f1232ea4f05c7daf248d5e82ff2a6892c98093994f2" - -PR = "r0" - -FILES:${PN}-doc += "/usr/doc" - -inherit autotools - |