From 83b5cde41ddb8fd20de4536dd68eb08da42d013e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 17 Jul 2022 20:32:17 +0100 Subject: gentoo auto-resync : 17:07:2022 - 20:32:17 --- x11-misc/idesk/Manifest | 9 ++-- .../files/idesk-0.7.8-use-pkg-config-imlib2.patch | 40 +++++++++++++++++ .../files/idesk-1-use-pkg-config-imlib2.patch | 38 ---------------- x11-misc/idesk/idesk-0.7.8.ebuild | 51 ++++++++++++++++++++++ x11-misc/idesk/idesk-1-r1.ebuild | 48 -------------------- x11-misc/idesk/idesk-1.ebuild | 40 ----------------- x11-misc/idesk/metadata.xml | 2 +- 7 files changed, 96 insertions(+), 132 deletions(-) create mode 100644 x11-misc/idesk/files/idesk-0.7.8-use-pkg-config-imlib2.patch delete mode 100644 x11-misc/idesk/files/idesk-1-use-pkg-config-imlib2.patch create mode 100644 x11-misc/idesk/idesk-0.7.8.ebuild delete mode 100644 x11-misc/idesk/idesk-1-r1.ebuild delete mode 100644 x11-misc/idesk/idesk-1.ebuild (limited to 'x11-misc/idesk') diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest index 7a1bcc9e0f98..2a9d41d05329 100644 --- a/x11-misc/idesk/Manifest +++ b/x11-misc/idesk/Manifest @@ -1,5 +1,4 @@ -AUX idesk-1-use-pkg-config-imlib2.patch 1054 BLAKE2B c126a0f13b2cc398b431cdf1dc94da4c00ace1bcbda167498d0ff4144c883c94867a7601fd16c48ae272464fa4f9761350d83c24b0bf2ad58c149673c6a2dd38 SHA512 a6e1b6b68a160df2427eaaf0b6704564a63d569b69face75478535e09fcb2d119af38ca437ccdf50619ea75834b39155b9d0f3215a688033a15feee350d2a540 -DIST idesk-v1.tar.gz 195147 BLAKE2B 2b2b0dacbfb1d8fb950c88d990e3674bf8b4cf82d9022ed2f7be1f32082c46ae32d8200957e2e19d0d21ea1e4d59ec092f4cba90e712f79700a04f05c3a3aa14 SHA512 3190fca7a5c9fb36b66159107d22b5f6e50b4573afa21a3a4d8b8e3e5953dabda077c924e45d2607b849ee5fea141eb80f5b89ce5288ebc2490679f319edf768 -EBUILD idesk-1-r1.ebuild 910 BLAKE2B f0b258bac8b21cfeac384fe59a9822f67606dc7e6bdfb39ed6778cba47d3e5e1e4f9f25dddc235adeaee98c841e174a2ea2075a53abf79cb27566ee8a7a15b1c SHA512 e3fd15e4959d67504ca6a6b95b64171493e473d2f558c30f8ed77ac83b95fac51a4ec1ed333d66b8edde0150548287082a669db45b7d5c0ce7f537b1a5ce4b85 -EBUILD idesk-1.ebuild 792 BLAKE2B dc2ac6e6aa9e7044aff7c0e941e3f93ff92cd53a874f997a89cfc27763d4e16d4dee3b042cff9e0ec0ffbd4832a5d7f0278c6a27eb1b1ec3253c5c6f2f6008ee SHA512 ecfd30726a6f93f5428d1d240cb4651ad1becd9f9a76824c357bd39696bbec3590ed578da7323f6317d6add56d071090872bee8612536159f23851b26c051852 -MISC metadata.xml 256 BLAKE2B 9cc198243be9a95645c1e88dd2838b1f70afe3cdb08cae721e59b4942a5b4b561a5bbc129baaaa52c023fde708be5629e47230eb335084c9e24bd0ff8764a7d5 SHA512 878114abde4788d790a6b61c20cad1421f652c383fcd57b63926c6bc7c906ccd22e461c50d9e2459d06077e80d29215b17f9d35fbb18db9a2e794093e8db9de7 +AUX idesk-0.7.8-use-pkg-config-imlib2.patch 1134 BLAKE2B d36a0c64183fdc527fb7334c91f1b6aea9e82b4e719ee18441f3eb29eebadaf8925f783673ec6d90f71587f424fba6e3b47545be150441b40ae774c3124808e5 SHA512 298b331a452e516ed29ed8842ecf18da3228a6fad6cde8306e241aa6ca0289f9e4d21c912890893d9e44af0dc35974acf9d9f82968e26fd8c20b8c14c853106b +DIST idesk-0.7.8.tar.gz 202949 BLAKE2B 93f902ab8b073d5b8e4a03d65ce99379e4adcf7ae6220be858ef7f1ce1f326cbbcc50c6d99424d8153ad498c9498939f39c51de1aa231c392a18636ee53788ee SHA512 0456646788ab70d1fc05ee0fc5f9d811f9f67c2420039ec525f42b6634ec92c1e3f8f061af5c407a22ab81db873efde216ad5c4fccba6fb27f1777d2e66a5535 +EBUILD idesk-0.7.8.ebuild 943 BLAKE2B e4b7b6d5ee6f4dbdbb3cb4575d34b5e6e0531bfe017a6b0d5da467127a214eaf394336079b2fcef8b79c4c0e95228fea0e5adb7b208bebc76179acd2186e8f4b SHA512 0f03d146382235f495fbf6b092efb240f12224caf8eaaf04262faed4451f9ad0c12fb2c7536265351ebd4134249c1cbc2cacd12bbab9daf1dec319ac32878dd9 +MISC metadata.xml 245 BLAKE2B b60a082675d86c770f68dd89b09eb8dac037e162b21b2ce8d9e7053ce7a11d2c9c059975da5c98cd8cf55564064a02ee53ac91d0f99dfc592d465261e693c777 SHA512 176b4d633dc9e1afb2c30783cd24c3470fae3b1a4856230a3dd74f7bdaa4dea6c8d6cc4b6bd2461ae66488dc5da35caa2b20a31b0755472833c977e2da840397 diff --git a/x11-misc/idesk/files/idesk-0.7.8-use-pkg-config-imlib2.patch b/x11-misc/idesk/files/idesk-0.7.8-use-pkg-config-imlib2.patch new file mode 100644 index 000000000000..7f062c94280f --- /dev/null +++ b/x11-misc/idesk/files/idesk-0.7.8-use-pkg-config-imlib2.patch @@ -0,0 +1,40 @@ +https://github.com/antonialoytorrens/idesk/pull/1 +https://github.com/neagix/idesk/pull/9 +https://github.com/neagix/idesk/issues/7 + +From b13626bbe2669b8a267ad53df93f1060379a462e Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Fri, 15 Jul 2022 08:22:12 +0100 +Subject: [PATCH] build: use pkg-config to find imlib2 + +imlib2 1.7.5+ drops imlib2-config, hence pkg-config +must now be used to find it. + +Bug: https://bugs.gentoo.org/828962 +--- a/configure.in ++++ b/configure.in +@@ -94,19 +94,10 @@ LIBS="$LIBS $Xext_lib" + + dnl Imlib2 detection + +-AC_PATH_GENERIC(imlib2, , [ +- AC_SUBST(IMLIB_LIBS) +- AC_SUBST(IMLIB_CXXFLAGS) ], +- AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path? +- You need Imlib2 to build Idesk. Verify that you have Imlib2-dev)) +- +-dnl the above doesn't work for some reason :/ +-IMLIB_LIBS=`imlib2-config --libs` +-IMLIB_CFLAGS=`imlib2-config --cflags` +-AC_SUBST(IMLIB_LIBS) +-AC_SUBST(IMLIB_CXXFLAGS) +- +-CXXFLAGS="$CXXFLAGS $IMLIB_CXXFLAGS" ++PKG_PROG_PKG_CONFIG ++PKG_CHECK_MODULES([IMLIB], [imlib2 > 1.0]) ++ ++CXXFLAGS="$CXXFLAGS $IMLIB_CFLAGS" + LIBS="$LIBS $IMLIB_LIBS" + + + diff --git a/x11-misc/idesk/files/idesk-1-use-pkg-config-imlib2.patch b/x11-misc/idesk/files/idesk-1-use-pkg-config-imlib2.patch deleted file mode 100644 index 36e088972543..000000000000 --- a/x11-misc/idesk/files/idesk-1-use-pkg-config-imlib2.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://github.com/antonialoytorrens/idesk/pull/1 - -From b13626bbe2669b8a267ad53df93f1060379a462e Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Fri, 15 Jul 2022 08:22:12 +0100 -Subject: [PATCH] build: use pkg-config to find imlib2 - -imlib2 1.7.5+ drops imlib2-config, hence pkg-config -must now be used to find it. - -Bug: https://bugs.gentoo.org/828962 ---- a/configure.in -+++ b/configure.in -@@ -94,19 +94,10 @@ LIBS="$LIBS $Xext_lib" - - dnl Imlib2 detection - --AC_PATH_GENERIC(imlib2, , [ -- AC_SUBST(IMLIB_LIBS) -- AC_SUBST(IMLIB_CXXFLAGS) ], -- AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path? -- You need Imlib2 to build Idesk. Verify that you have Imlib2-dev)) -- --dnl the above doesn't work for some reason :/ --IMLIB_LIBS=`imlib2-config --libs` --IMLIB_CFLAGS=`imlib2-config --cflags` --AC_SUBST(IMLIB_LIBS) --AC_SUBST(IMLIB_CXXFLAGS) -- --CXXFLAGS="$CXXFLAGS $IMLIB_CXXFLAGS" -+PKG_PROG_PKG_CONFIG -+PKG_CHECK_MODULES([IMLIB], [imlib2 > 1.0]) -+ -+CXXFLAGS="$CXXFLAGS $IMLIB_CFLAGS" - LIBS="$LIBS $IMLIB_LIBS" - - - diff --git a/x11-misc/idesk/idesk-0.7.8.ebuild b/x11-misc/idesk/idesk-0.7.8.ebuild new file mode 100644 index 000000000000..b6e6b14254a7 --- /dev/null +++ b/x11-misc/idesk/idesk-0.7.8.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Utility to place icons on the root window" +HOMEPAGE="https://github.com/neagix/idesk" +SRC_URI="https://github.com/neagix/idesk/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86" +IUSE="svg" + +RDEPEND=" + dev-libs/glib + dev-libs/libxml2 + media-libs/freetype + media-libs/imlib2[X] + media-libs/libart_lgpl + x11-libs/libXft + x11-libs/gtk+:3 + x11-libs/pango + x11-libs/startup-notification + svg? ( + gnome-base/librsvg + x11-libs/gdk-pixbuf + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.7.8-use-pkg-config-imlib2.patch +) + +src_prepare() { + default + + sed -i -e 's,/usr/local/,/usr/,' examples/default.lnk || die + + eautoreconf +} + +src_configure() { + econf \ + --enable-libsn \ + $(use_enable svg) +} diff --git a/x11-misc/idesk/idesk-1-r1.ebuild b/x11-misc/idesk/idesk-1-r1.ebuild deleted file mode 100644 index 6b94e84161c4..000000000000 --- a/x11-misc/idesk/idesk-1-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P="${PN}-v${PV}" - -inherit autotools - -DESCRIPTION="Utility to place icons on the root window" -HOMEPAGE="https://github.com/antonialoytorrens/idesk/" -SRC_URI="https://github.com/antonialoytorrens/idesk/releases/download/v1/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" - -S="${WORKDIR}/${MY_P}" - -RDEPEND=" - dev-libs/glib - dev-libs/libxml2 - media-libs/freetype - media-libs/imlib2[X] - media-libs/libart_lgpl - x11-libs/libXft - x11-libs/gtk+:3 - x11-libs/pango - x11-libs/startup-notification -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1-use-pkg-config-imlib2.patch -) - -src_prepare() { - default - - sed -i -e 's,/usr/local/,/usr/,' examples/default.lnk || die - - eautoreconf -} - -src_configure() { - econf --enable-libsn -} diff --git a/x11-misc/idesk/idesk-1.ebuild b/x11-misc/idesk/idesk-1.ebuild deleted file mode 100644 index d32a60e327c4..000000000000 --- a/x11-misc/idesk/idesk-1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="${PN}-v${PV}" - -DESCRIPTION="Utility to place icons on the root window" -HOMEPAGE="https://github.com/antonialoytorrens/idesk/" -SRC_URI="https://github.com/antonialoytorrens/idesk/releases/download/v1/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86" - -S="${WORKDIR}/${MY_P}" - -RDEPEND=" - dev-libs/glib - dev-libs/libxml2 - media-libs/freetype - media-libs/imlib2[X] - media-libs/libart_lgpl - x11-libs/gtk+:3 - x11-libs/pango - x11-libs/startup-notification -" - -BDEPEND="virtual/pkgconfig" - -DEPEND="${RDEPEND}" - -src_prepare() { - default - sed -i -e 's,/usr/local/,/usr/,' examples/default.lnk || die -} - -src_configure() { - econf --enable-libsn -} diff --git a/x11-misc/idesk/metadata.xml b/x11-misc/idesk/metadata.xml index 67600fcfca2b..03c3aedb73c9 100644 --- a/x11-misc/idesk/metadata.xml +++ b/x11-misc/idesk/metadata.xml @@ -3,6 +3,6 @@ - antonialoytorrens/idesk + neagix/idesk -- cgit v1.2.3