[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 61e06ebae00b29238ee3c2899859a8cc1ac3e124 Author: Eli Schwartz gentoo org> AuthorDate: Tue Jul 23 00:01:29 2024 + Commit: Eli Schwartz gentoo org> CommitDate: Tue Jul 23 03:32:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e06eba media-gfx/geeqie: remove LTO workaround Fixed upstream in 2.4 Signed-off-by: Eli Schwartz gentoo.org> media-gfx/geeqie/geeqie-2.4.ebuild | 7 +-- media-gfx/geeqie/geeqie-.ebuild | 7 +-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/media-gfx/geeqie/geeqie-2.4.ebuild b/media-gfx/geeqie/geeqie-2.4.ebuild index f533a7ba88cb..6a0d6f40a119 100644 --- a/media-gfx/geeqie/geeqie-2.4.ebuild +++ b/media-gfx/geeqie/geeqie-2.4.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{3,4} ) -inherit flag-o-matic lua-single meson optfeature xdg +inherit lua-single meson optfeature xdg DESCRIPTION="A lightweight GTK image viewer forked from GQview" HOMEPAGE="http://www.geeqie.org"; @@ -64,11 +64,6 @@ src_prepare() { } src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/585432 - # https://github.com/BestImageViewer/geeqie/issues/1270 - filter-lto - local emesonargs=( -Dgq_helpdir="share/doc/${PF}" -Dgq_htmldir="share/doc/${PF}/html" diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index 739e6f7323f0..254d54766ea2 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{3,4} ) -inherit flag-o-matic git-r3 lua-single meson optfeature xdg +inherit git-r3 lua-single meson optfeature xdg DESCRIPTION="A lightweight GTK image viewer forked from GQview" HOMEPAGE="http://www.geeqie.org"; @@ -57,11 +57,6 @@ src_prepare() { } src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/585432 - # https://github.com/BestImageViewer/geeqie/issues/1270 - filter-lto - local emesonargs=( -Dgq_helpdir="share/doc/${PF}" -Dgq_htmldir="share/doc/${PF}/html"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 4734f9426f9ca89daa8eaa4139a9f67fc2b9d483 Author: Eli Schwartz gentoo org> AuthorDate: Tue Jul 23 00:07:29 2024 + Commit: Eli Schwartz gentoo org> CommitDate: Tue Jul 23 03:32:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4734f942 media-gfx/geeqie: update HOMEPAGE for https Signed-off-by: Eli Schwartz gentoo.org> media-gfx/geeqie/geeqie-2.4.ebuild | 2 +- media-gfx/geeqie/geeqie-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/geeqie/geeqie-2.4.ebuild b/media-gfx/geeqie/geeqie-2.4.ebuild index 6a0d6f40a119..f388de011d32 100644 --- a/media-gfx/geeqie/geeqie-2.4.ebuild +++ b/media-gfx/geeqie/geeqie-2.4.ebuild @@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-{3,4} ) inherit lua-single meson optfeature xdg DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org"; +HOMEPAGE="https://www.geeqie.org"; SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"; # Doc build: diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index 254d54766ea2..54d5d3c640fa 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-{3,4} ) inherit git-r3 lua-single meson optfeature xdg DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org"; +HOMEPAGE="https://www.geeqie.org"; # Using github mirror, as geeqie.org does not have a valid SSL certificate EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git";
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/
commit: c9c614a8e49431f59e273c6213bf1fcbfa9b8086 Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Jul 16 20:25:25 2024 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Jul 16 20:27:10 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c614a8 media-gfx/geeqie: drop 2.1-r1, 2.2, 2.3 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest | 6 - .../geeqie/files/geeqie-2.1-exiv2-0.28.0.patch | 151 - media-gfx/geeqie/files/geeqie-2.1-locale.patch | 22 --- media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch| 19 --- media-gfx/geeqie/files/geeqie-2.3-locale.patch | 11 -- media-gfx/geeqie/geeqie-2.1-r1.ebuild | 117 media-gfx/geeqie/geeqie-2.2.ebuild | 115 media-gfx/geeqie/geeqie-2.3.ebuild | 119 8 files changed, 560 deletions(-) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index f2a4ecce649a..a8bb11e9e73c 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,8 +1,2 @@ -DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d -DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f -DIST geeqie-2.2-docs.tar.xz 356976 BLAKE2B 3bca2815a6f177a2f38b9a66ff6fa95dba510aa2afb36d5d6c9f6841c0c1b25c4f9aad7d45ef57d911f0caa2a8499a06aba2ccaf7e279382bf4304c88f11ea13 SHA512 0f89995573b02e82c715dcdf4d71a309691885ad785f1297d2fee01aff00f2aed43c9cff6900bddfa1a727598934ba7bb0ced32b0c86c6f1a115271a8a81592a -DIST geeqie-2.2.tar.xz 2169096 BLAKE2B fe7f21f5842ac7824ec37f0775d31e8dcd05934809f7bdd84d7dcb749d25976055050f42a8cea3cd414fb3c7e60055c9fa32b93cfef2af62de68f4d44af425c8 SHA512 7d03493b463a1949cbc5e377927abc4bc6fa62914e8cdddb30a832cb9c6caad579f5ba5bd2b8b0913b77063300c9c5ac1f7e671ddfb2ce18d8a8d0efcfb51dbe -DIST geeqie-2.3-docs.tar.xz 362412 BLAKE2B e05adbd6b277cfccae20c2ed7840e447016b32a9bf5c5ad6feb143993b4856fbb623feb6684a21c235ad846923463bed45cf887b1854189f01a46c3961f26a18 SHA512 cab4739adecd1dcb9cde3a58a2e2c2262f4014bc7594ae22af69b8bdbb14f6849b1e2267646301f31ebde76b2b2abc05e75aac3325e35cb88f9dc40703f2d943 -DIST geeqie-2.3.tar.xz 2184604 BLAKE2B dbd2d52d146d373a9694a7371a8ac44571e63895cf6cea7acb549a1135b4cf5869737cdf780ca6afdb14eda1338cb275791eaac1cd7596ed58eb07759cf75778 SHA512 9f45974d12c1f193a4a3624064b967fc06cf9c906c45160a4945a8f6a9d814b929b92c45a35006c7f1b20fa5fe360858f24fd54adbcd8863c3e7d787a3429899 DIST geeqie-2.4-docs.tar.xz 364536 BLAKE2B 688720808c8e4543455259966aef726bf56a821890a78e4757d9d1fd02ce67217461808d9697b331b2a94841bf3581b25242a7e5c9c9a3f5b02209a566b09c16 SHA512 07bca33c347f448ee853ea60daf22c9cdace458b6ce6b3f4ced9b343a965370c51d7a872d5279852b7a83a1de51c8529a668f7d62a031bcec1fdde8b9bfbf9cb DIST geeqie-2.4.tar.xz 2178572 BLAKE2B df24f0b5d443cbd2033c0b382fe0d846c9073e8966aa736f647e34930e44083b9e44252c554578548a13c12c1b1a5a48bb7795f2fda8b8688a63ef402a257334 SHA512 7e0f5dff21e38a41adf0a793bd82652c5d639e84ab49403517f4b1dae042bfc5f4d02e54b54928e04a2397300acb04b130347df0be5637ee48634f5865ad346b diff --git a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch b/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch deleted file mode 100644 index 13b6a171257d.. --- a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch +++ /dev/null @@ -1,151 +0,0 @@ -From c45cca777aa3477eaf297db99f337e18d9683c61 Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse -Date: Wed, 21 Jun 2023 12:23:33 +0100 -Subject: [PATCH] Add ExifData as extra argument to - exif_item_get_data_as_text(). - - src/advanced-exif.cc | 2 +- - src/exif-common.cc | 2 +- - src/exif.cc | 8 - src/exif.h | 2 +- - src/exiv2.cc | 4 ++-- - 5 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc -index 79a54b12..e3d3067a 100644 a/src/advanced-exif.cc -+++ b/src/advanced-exif.cc -@@ -120,7 +120,7 @@ static void advanced_exif_update(ExifWin *ew) - tag = g_strdup_printf("0x%04x", exif_item_get_tag_id(item)); - tag_name = exif_item_get_tag_name(item); - format = exif_item_get_format_name(item, TRUE); -- text = exif_item_get_data_as_text(item); -+ text = exif_item_get_data_as_text(item, exif); - utf8_text = utf8_validate_or_convert(text); - g_free(text); - elements
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: a1af7b55cc0896ee768a7359d8a5e087ff211b4b Author: Arthur Zamarin gentoo org> AuthorDate: Wed Jun 26 19:32:29 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Jun 26 19:32:29 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1af7b55 media-gfx/geeqie: Stabilize 2.4 amd64, #934971 Signed-off-by: Arthur Zamarin gentoo.org> media-gfx/geeqie/geeqie-2.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-2.4.ebuild b/media-gfx/geeqie/geeqie-2.4.ebuild index d372ffa16fc9..f533a7ba88cb 100644 --- a/media-gfx/geeqie/geeqie-2.4.ebuild +++ b/media-gfx/geeqie/geeqie-2.4.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc x86" +KEYWORDS="amd64 ~arm64 ~ppc x86" IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: c14f4d8619d4b7b561aa67b812f578576e19644b Author: Arthur Zamarin gentoo org> AuthorDate: Wed Jun 26 19:32:28 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Jun 26 19:32:28 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c14f4d86 media-gfx/geeqie: Stabilize 2.4 x86, #934971 Signed-off-by: Arthur Zamarin gentoo.org> media-gfx/geeqie/geeqie-2.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-2.4.ebuild b/media-gfx/geeqie/geeqie-2.4.ebuild index 2b9b96fbe6a9..d372ffa16fc9 100644 --- a/media-gfx/geeqie/geeqie-2.4.ebuild +++ b/media-gfx/geeqie/geeqie-2.4.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc x86" IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 7b191e39343855bfdd34c4b49d8bfbe7cb22ff81 Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Mar 25 20:15:07 2024 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Mar 25 20:15:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b191e39 media-gfx/geeqie: add 2.4 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest | 2 + media-gfx/geeqie/geeqie-2.4.ebuild | 117 + 2 files changed, 119 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 3aa1c6752ab0..f2a4ecce649a 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -4,3 +4,5 @@ DIST geeqie-2.2-docs.tar.xz 356976 BLAKE2B 3bca2815a6f177a2f38b9a66ff6fa95dba510 DIST geeqie-2.2.tar.xz 2169096 BLAKE2B fe7f21f5842ac7824ec37f0775d31e8dcd05934809f7bdd84d7dcb749d25976055050f42a8cea3cd414fb3c7e60055c9fa32b93cfef2af62de68f4d44af425c8 SHA512 7d03493b463a1949cbc5e377927abc4bc6fa62914e8cdddb30a832cb9c6caad579f5ba5bd2b8b0913b77063300c9c5ac1f7e671ddfb2ce18d8a8d0efcfb51dbe DIST geeqie-2.3-docs.tar.xz 362412 BLAKE2B e05adbd6b277cfccae20c2ed7840e447016b32a9bf5c5ad6feb143993b4856fbb623feb6684a21c235ad846923463bed45cf887b1854189f01a46c3961f26a18 SHA512 cab4739adecd1dcb9cde3a58a2e2c2262f4014bc7594ae22af69b8bdbb14f6849b1e2267646301f31ebde76b2b2abc05e75aac3325e35cb88f9dc40703f2d943 DIST geeqie-2.3.tar.xz 2184604 BLAKE2B dbd2d52d146d373a9694a7371a8ac44571e63895cf6cea7acb549a1135b4cf5869737cdf780ca6afdb14eda1338cb275791eaac1cd7596ed58eb07759cf75778 SHA512 9f45974d12c1f193a4a3624064b967fc06cf9c906c45160a4945a8f6a9d814b929b92c45a35006c7f1b20fa5fe360858f24fd54adbcd8863c3e7d787a3429899 +DIST geeqie-2.4-docs.tar.xz 364536 BLAKE2B 688720808c8e4543455259966aef726bf56a821890a78e4757d9d1fd02ce67217461808d9697b331b2a94841bf3581b25242a7e5c9c9a3f5b02209a566b09c16 SHA512 07bca33c347f448ee853ea60daf22c9cdace458b6ce6b3f4ced9b343a965370c51d7a872d5279852b7a83a1de51c8529a668f7d62a031bcec1fdde8b9bfbf9cb +DIST geeqie-2.4.tar.xz 2178572 BLAKE2B df24f0b5d443cbd2033c0b382fe0d846c9073e8966aa736f647e34930e44083b9e44252c554578548a13c12c1b1a5a48bb7795f2fda8b8688a63ef402a257334 SHA512 7e0f5dff21e38a41adf0a793bd82652c5d639e84ab49403517f4b1dae042bfc5f4d02e54b54928e04a2397300acb04b130347df0be5637ee48634f5865ad346b diff --git a/media-gfx/geeqie/geeqie-2.4.ebuild b/media-gfx/geeqie/geeqie-2.4.ebuild new file mode 100644 index ..2b9b96fbe6a9 --- /dev/null +++ b/media-gfx/geeqie/geeqie-2.4.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +LUA_COMPAT=( lua5-{3,4} ) + +inherit flag-o-matic lua-single meson optfeature xdg + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"; +# Doc build: +# clone git at matching tag +# mkdir build; ./gen_changelog.sh . build; +# pandoc README.md -o build/README.html + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" + +RDEPEND="gnome-extra/zenity + virtual/libintl + x11-libs/gtk+:3 + djvu? ( app-text/djvu ) + exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + heif? ( >=media-libs/libheif-1.3.2 ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpegxl? ( >=media-libs/libjxl-0.3.7:= ) + lcms? ( media-libs/lcms:2 ) + lua? ( ${LUA_DEPS} ) + map? ( media-libs/clutter-gtk + media-libs/libchamplain:0.12[gtk] ) + pdf? ( >=app-text/poppler-0.62[cairo] ) + raw? ( >=media-libs/libraw-0.20:= ) + spell? ( app-text/gspell ) + tiff? ( media-libs/tiff:= ) + webp? ( gui-libs/gdk-pixbuf-loader-webp:= ) + zip? ( >=app-arch/libarchive-3.4.0 )" +DEPEND="${RDEPEND}" +BDEPEND=" + || ( dev-util/xxdi app-editors/vim-core ) + dev-util/glib-utils + sys-devel/gettext + virtual/pkgconfig" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +PATCHES=( "${FILESDIR}"/${PN}-2.3-test-ancillary.patch ) + +pkg_setup() { + # Do not require setting LUA_SINGLE_TARGET if lua is not used + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + + # Disable doc build - not useful most of the time per upstream + sed -e "/subdir('doc')/d" -i meson.build || die +} + +src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/585432 + # https://github.com/BestImageViewer/geeqie/issues/1270 + filter-lto + + local emesonargs=( + -Dgq_helpdir="share/doc/${PF}" + -Dgq_htmldir="s
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
commit: d7ce3a914c4c749f64fbbf5ee0a0ea8f2aee7674 Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Mar 25 20:07:07 2024 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Mar 25 20:07:28 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7ce3a91 media-gfx/geeqie: fix musl compilation again Closes: https://bugs.gentoo.org/927682 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/files/geeqie-2.3-locale.patch | 11 +++ media-gfx/geeqie/geeqie-2.3.ebuild | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/media-gfx/geeqie/files/geeqie-2.3-locale.patch b/media-gfx/geeqie/files/geeqie-2.3-locale.patch new file mode 100644 index ..05f8bdcfdaea --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-2.3-locale.patch @@ -0,0 +1,11 @@ +diff -Naur geeqie-2.3.orig/src/misc.cc geeqie-2.3/src/misc.cc +--- geeqie-2.3.orig/src/misc.cc2024-03-06 16:56:22.0 +0100 geeqie-2.3/src/misc.cc 2024-03-25 21:03:18.655779225 +0100 +@@ -23,6 +23,7 @@ + #include + #include + ++#include + #include + #include + #include diff --git a/media-gfx/geeqie/geeqie-2.3.ebuild b/media-gfx/geeqie/geeqie-2.3.ebuild index 2b9b96fbe6a9..dae22816e4fd 100644 --- a/media-gfx/geeqie/geeqie-2.3.ebuild +++ b/media-gfx/geeqie/geeqie-2.3.ebuild @@ -49,7 +49,9 @@ BDEPEND=" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" -PATCHES=( "${FILESDIR}"/${PN}-2.3-test-ancillary.patch ) +PATCHES=( "${FILESDIR}"/${PN}-2.3-test-ancillary.patch + "${FILESDIR}"/${P}-locale.patch + ) pkg_setup() { # Do not require setting LUA_SINGLE_TARGET if lua is not used
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
commit: 3bdf8d1bf7a753f7367a8274ec90026b47d34889 Author: Bernard Cafarelli gentoo org> AuthorDate: Sat Mar 9 10:24:33 2024 + Commit: Bernard Cafarelli gentoo org> CommitDate: Sat Mar 9 10:24:59 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bdf8d1b media-gfx/geeqie: skip locally broken test Closes: https://bugs.gentoo.org/926560 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/files/geeqie-2.3-test-ancillary.patch | 13 + media-gfx/geeqie/geeqie-2.3.ebuild | 2 ++ 2 files changed, 15 insertions(+) diff --git a/media-gfx/geeqie/files/geeqie-2.3-test-ancillary.patch b/media-gfx/geeqie/files/geeqie-2.3-test-ancillary.patch new file mode 100644 index ..4d02d8ef91af --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-2.3-test-ancillary.patch @@ -0,0 +1,13 @@ +diff -Naur geeqie-2.3.orig/meson.build geeqie-2.3/meson.build +--- geeqie-2.3.orig/meson.build2024-03-06 16:56:22.0 +0100 geeqie-2.3/meson.build 2024-03-09 11:21:17.870229854 +0100 +@@ -742,9 +742,3 @@ + else + summary({'lua' : ['Test runs:', false]}, section : 'Testing', bool_yn : true) + endif +- +-# Ancillary files test +-test_ancillary_files_sh = find_program('test-ancillary-files.sh', dirs : scriptsdir, required : true) +-test('Ancillary files', test_ancillary_files_sh, args: [meson.current_source_dir()], timeout: 100) +- +-summary({'Ancillary files' : ['Test runs:', true]}, section : 'Testing', bool_yn : true) diff --git a/media-gfx/geeqie/geeqie-2.3.ebuild b/media-gfx/geeqie/geeqie-2.3.ebuild index db97d02cdbaa..2b9b96fbe6a9 100644 --- a/media-gfx/geeqie/geeqie-2.3.ebuild +++ b/media-gfx/geeqie/geeqie-2.3.ebuild @@ -49,6 +49,8 @@ BDEPEND=" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" +PATCHES=( "${FILESDIR}"/${PN}-2.3-test-ancillary.patch ) + pkg_setup() { # Do not require setting LUA_SINGLE_TARGET if lua is not used use lua && lua-single_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 357b9dd9b3e0f40d348746c81945d8bc98cb7742 Author: Bernard Cafarelli gentoo org> AuthorDate: Sat Mar 9 07:40:45 2024 + Commit: Bernard Cafarelli gentoo org> CommitDate: Sat Mar 9 08:33:44 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=357b9dd9 media-gfx/geeqie: clean empty assignments in live ebuild Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index 97a864ec91b7..739e6f7323f0 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -8,13 +8,11 @@ inherit flag-o-matic git-r3 lua-single meson optfeature xdg DESCRIPTION="A lightweight GTK image viewer forked from GQview" HOMEPAGE="http://www.geeqie.org"; -SRC_URI="" # Using github mirror, as geeqie.org does not have a valid SSL certificate EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 6b076cfd2aaab52e70d9f1e68c07f03b962e025d Author: Bernard Cafarelli gentoo org> AuthorDate: Sat Mar 9 07:40:21 2024 + Commit: Bernard Cafarelli gentoo org> CommitDate: Sat Mar 9 08:33:44 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b076cfd media-gfx/geeqie: add 2.3 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest | 2 + media-gfx/geeqie/geeqie-2.3.ebuild | 115 + 2 files changed, 117 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 7a17851089e8..3aa1c6752ab0 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -2,3 +2,5 @@ DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05 DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f DIST geeqie-2.2-docs.tar.xz 356976 BLAKE2B 3bca2815a6f177a2f38b9a66ff6fa95dba510aa2afb36d5d6c9f6841c0c1b25c4f9aad7d45ef57d911f0caa2a8499a06aba2ccaf7e279382bf4304c88f11ea13 SHA512 0f89995573b02e82c715dcdf4d71a309691885ad785f1297d2fee01aff00f2aed43c9cff6900bddfa1a727598934ba7bb0ced32b0c86c6f1a115271a8a81592a DIST geeqie-2.2.tar.xz 2169096 BLAKE2B fe7f21f5842ac7824ec37f0775d31e8dcd05934809f7bdd84d7dcb749d25976055050f42a8cea3cd414fb3c7e60055c9fa32b93cfef2af62de68f4d44af425c8 SHA512 7d03493b463a1949cbc5e377927abc4bc6fa62914e8cdddb30a832cb9c6caad579f5ba5bd2b8b0913b77063300c9c5ac1f7e671ddfb2ce18d8a8d0efcfb51dbe +DIST geeqie-2.3-docs.tar.xz 362412 BLAKE2B e05adbd6b277cfccae20c2ed7840e447016b32a9bf5c5ad6feb143993b4856fbb623feb6684a21c235ad846923463bed45cf887b1854189f01a46c3961f26a18 SHA512 cab4739adecd1dcb9cde3a58a2e2c2262f4014bc7594ae22af69b8bdbb14f6849b1e2267646301f31ebde76b2b2abc05e75aac3325e35cb88f9dc40703f2d943 +DIST geeqie-2.3.tar.xz 2184604 BLAKE2B dbd2d52d146d373a9694a7371a8ac44571e63895cf6cea7acb549a1135b4cf5869737cdf780ca6afdb14eda1338cb275791eaac1cd7596ed58eb07759cf75778 SHA512 9f45974d12c1f193a4a3624064b967fc06cf9c906c45160a4945a8f6a9d814b929b92c45a35006c7f1b20fa5fe360858f24fd54adbcd8863c3e7d787a3429899 diff --git a/media-gfx/geeqie/geeqie-2.3.ebuild b/media-gfx/geeqie/geeqie-2.3.ebuild new file mode 100644 index ..db97d02cdbaa --- /dev/null +++ b/media-gfx/geeqie/geeqie-2.3.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +LUA_COMPAT=( lua5-{3,4} ) + +inherit flag-o-matic lua-single meson optfeature xdg + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"; +# Doc build: +# clone git at matching tag +# mkdir build; ./gen_changelog.sh . build; +# pandoc README.md -o build/README.html + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" + +RDEPEND="gnome-extra/zenity + virtual/libintl + x11-libs/gtk+:3 + djvu? ( app-text/djvu ) + exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + heif? ( >=media-libs/libheif-1.3.2 ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpegxl? ( >=media-libs/libjxl-0.3.7:= ) + lcms? ( media-libs/lcms:2 ) + lua? ( ${LUA_DEPS} ) + map? ( media-libs/clutter-gtk + media-libs/libchamplain:0.12[gtk] ) + pdf? ( >=app-text/poppler-0.62[cairo] ) + raw? ( >=media-libs/libraw-0.20:= ) + spell? ( app-text/gspell ) + tiff? ( media-libs/tiff:= ) + webp? ( gui-libs/gdk-pixbuf-loader-webp:= ) + zip? ( >=app-arch/libarchive-3.4.0 )" +DEPEND="${RDEPEND}" +BDEPEND=" + || ( dev-util/xxdi app-editors/vim-core ) + dev-util/glib-utils + sys-devel/gettext + virtual/pkgconfig" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +pkg_setup() { + # Do not require setting LUA_SINGLE_TARGET if lua is not used + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + + # Disable doc build - not useful most of the time per upstream + sed -e "/subdir('doc')/d" -i meson.build || die +} + +src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/585432 + # https://github.com/BestImageViewer/geeqie/issues/1270 + filter-lto + + local emesonargs=( + -Dgq_helpdir="share/doc/${PF}" + -Dgq_htmldir="share/doc/${PF}/html" + $(meson_use debug) +
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 6f41146196d8324a7339495055cf1a5ab1b0a47d Author: Eli Schwartz gmail com> AuthorDate: Mon Mar 4 04:11:03 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 4 04:14:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f411461 media-gfx/geeqie: mark as LTO-unsafe Closes: https://bugs.gentoo.org/585432 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> media-gfx/geeqie/geeqie-2.1-r1.ebuild | 7 ++- media-gfx/geeqie/geeqie-2.2.ebuild| 7 ++- media-gfx/geeqie/geeqie-.ebuild | 9 +++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/media-gfx/geeqie/geeqie-2.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.1-r1.ebuild index e19752f02bbd..2a7751b70258 100644 --- a/media-gfx/geeqie/geeqie-2.1-r1.ebuild +++ b/media-gfx/geeqie/geeqie-2.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{3,4} ) -inherit lua-single meson optfeature xdg +inherit flag-o-matic lua-single meson optfeature xdg DESCRIPTION="A lightweight GTK image viewer forked from GQview" HOMEPAGE="http://www.geeqie.org"; @@ -64,6 +64,11 @@ src_prepare() { } src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/585432 + # https://github.com/BestImageViewer/geeqie/issues/1270 + filter-lto + local emesonargs=( -Dgq_helpdir="share/doc/${PF}" -Dgq_htmldir="share/doc/${PF}/html" diff --git a/media-gfx/geeqie/geeqie-2.2.ebuild b/media-gfx/geeqie/geeqie-2.2.ebuild index c1bf5433b1fb..db97d02cdbaa 100644 --- a/media-gfx/geeqie/geeqie-2.2.ebuild +++ b/media-gfx/geeqie/geeqie-2.2.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{3,4} ) -inherit lua-single meson optfeature xdg +inherit flag-o-matic lua-single meson optfeature xdg DESCRIPTION="A lightweight GTK image viewer forked from GQview" HOMEPAGE="http://www.geeqie.org"; @@ -62,6 +62,11 @@ src_prepare() { } src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/585432 + # https://github.com/BestImageViewer/geeqie/issues/1270 + filter-lto + local emesonargs=( -Dgq_helpdir="share/doc/${PF}" -Dgq_htmldir="share/doc/${PF}/html" diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index 80135160f44c..97a864ec91b7 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( lua5-{3,4} ) -inherit git-r3 lua-single meson optfeature xdg +inherit flag-o-matic git-r3 lua-single meson optfeature xdg DESCRIPTION="A lightweight GTK image viewer forked from GQview" HOMEPAGE="http://www.geeqie.org"; @@ -59,6 +59,11 @@ src_prepare() { } src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/585432 + # https://github.com/BestImageViewer/geeqie/issues/1270 + filter-lto + local emesonargs=( -Dgq_helpdir="share/doc/${PF}" -Dgq_htmldir="share/doc/${PF}/html"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 654507ca1d241925e7a8244e934d03288a2c0101 Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Jan 26 19:00:34 2024 + Commit: Bernard Cafarelli gentoo org> CommitDate: Sat Jan 27 10:02:19 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=654507ca media-gfx/geeqie: add 2.2 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest | 2 + media-gfx/geeqie/geeqie-2.2.ebuild | 110 + 2 files changed, 112 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 2b1c26d88543..7a17851089e8 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,2 +1,4 @@ DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f +DIST geeqie-2.2-docs.tar.xz 356976 BLAKE2B 3bca2815a6f177a2f38b9a66ff6fa95dba510aa2afb36d5d6c9f6841c0c1b25c4f9aad7d45ef57d911f0caa2a8499a06aba2ccaf7e279382bf4304c88f11ea13 SHA512 0f89995573b02e82c715dcdf4d71a309691885ad785f1297d2fee01aff00f2aed43c9cff6900bddfa1a727598934ba7bb0ced32b0c86c6f1a115271a8a81592a +DIST geeqie-2.2.tar.xz 2169096 BLAKE2B fe7f21f5842ac7824ec37f0775d31e8dcd05934809f7bdd84d7dcb749d25976055050f42a8cea3cd414fb3c7e60055c9fa32b93cfef2af62de68f4d44af425c8 SHA512 7d03493b463a1949cbc5e377927abc4bc6fa62914e8cdddb30a832cb9c6caad579f5ba5bd2b8b0913b77063300c9c5ac1f7e671ddfb2ce18d8a8d0efcfb51dbe diff --git a/media-gfx/geeqie/geeqie-2.2.ebuild b/media-gfx/geeqie/geeqie-2.2.ebuild new file mode 100644 index ..c1bf5433b1fb --- /dev/null +++ b/media-gfx/geeqie/geeqie-2.2.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +LUA_COMPAT=( lua5-{3,4} ) + +inherit lua-single meson optfeature xdg + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"; +# Doc build: +# clone git at matching tag +# mkdir build; ./gen_changelog.sh . build; +# pandoc README.md -o build/README.html + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" + +RDEPEND="gnome-extra/zenity + virtual/libintl + x11-libs/gtk+:3 + djvu? ( app-text/djvu ) + exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + heif? ( >=media-libs/libheif-1.3.2 ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpegxl? ( >=media-libs/libjxl-0.3.7:= ) + lcms? ( media-libs/lcms:2 ) + lua? ( ${LUA_DEPS} ) + map? ( media-libs/clutter-gtk + media-libs/libchamplain:0.12[gtk] ) + pdf? ( >=app-text/poppler-0.62[cairo] ) + raw? ( >=media-libs/libraw-0.20:= ) + spell? ( app-text/gspell ) + tiff? ( media-libs/tiff:= ) + webp? ( gui-libs/gdk-pixbuf-loader-webp:= ) + zip? ( >=app-arch/libarchive-3.4.0 )" +DEPEND="${RDEPEND}" +BDEPEND=" + || ( dev-util/xxdi app-editors/vim-core ) + dev-util/glib-utils + sys-devel/gettext + virtual/pkgconfig" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +pkg_setup() { + # Do not require setting LUA_SINGLE_TARGET if lua is not used + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + + # Disable doc build - not useful most of the time per upstream + sed -e "/subdir('doc')/d" -i meson.build || die +} + +src_configure() { + local emesonargs=( + -Dgq_helpdir="share/doc/${PF}" + -Dgq_htmldir="share/doc/${PF}/html" + $(meson_use debug) + $(meson_feature djvu) + $(meson_feature exif exiv2) + $(meson_feature ffmpegthumbnailer videothumbnailer) + $(meson_feature heif) + $(meson_feature jpeg) + $(meson_feature jpeg2k j2k) + $(meson_feature jpegxl) + $(meson_feature lcms cms) + $(meson_feature lua) + $(meson_feature map gps-map) + $(meson_feature pdf) + $(meson_feature raw libraw) + $(meson_feature spell) +
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
commit: 252054c821aa8caf844a1c61b79fc42deff53afc Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Jan 23 21:18:06 2024 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Jan 23 21:18:44 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=252054c8 media-gfx/geeqie: fix compilation with musl Missing locale.h include, already fixed usptream in master Closes: https://bugs.gentoo.org/921193 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/files/geeqie-2.1-locale.patch | 22 ++ media-gfx/geeqie/geeqie-2.1-r1.ebuild | 1 + 2 files changed, 23 insertions(+) diff --git a/media-gfx/geeqie/files/geeqie-2.1-locale.patch b/media-gfx/geeqie/files/geeqie-2.1-locale.patch new file mode 100644 index ..10ae6b0169c5 --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-2.1-locale.patch @@ -0,0 +1,22 @@ +From 01d8762d45a2f3871cfd09176edbccdbe73a6767 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner +Date: Sat, 17 Jun 2023 18:47:28 +0200 +Subject: [PATCH] Add missing header for setlocale(). + +--- + src/misc.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/misc.cc b/src/misc.cc +index 9942605ce..a2ad3eb69 100644 +--- a/src/misc.cc b/src/misc.cc +@@ -18,6 +18,8 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#include ++ + #include "main.h" + #include "misc.h" + diff --git a/media-gfx/geeqie/geeqie-2.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.1-r1.ebuild index 9acadcda8fe6..e19752f02bbd 100644 --- a/media-gfx/geeqie/geeqie-2.1-r1.ebuild +++ b/media-gfx/geeqie/geeqie-2.1-r1.ebuild @@ -46,6 +46,7 @@ BDEPEND=" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" PATCHES=( + "${FILESDIR}"/${P}-locale.patch "${FILESDIR}"/${P}-lua_hpp.patch "${FILESDIR}"/${P}-exiv2-0.28.0.patch )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
commit: 7dbebf592df2cfac7e1e4ec51108a48074db132e Author: Bernard Cafarelli gentoo org> AuthorDate: Thu Jan 11 11:57:09 2024 + Commit: Bernard Cafarelli gentoo org> CommitDate: Thu Jan 11 11:57:09 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dbebf59 media-gfx/geeqie: drop 2.0.1-r4, 2.1 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest | 2 - .../geeqie/files/geeqie-2.0.1-allow_xxdi.patch | 17 --- .../geeqie/files/geeqie-2.0.1-doc_option.patch | 81 --- media-gfx/geeqie/geeqie-2.0.1-r4.ebuild| 115 - media-gfx/geeqie/geeqie-2.1.ebuild | 110 5 files changed, 325 deletions(-) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 633043002b47..2b1c26d88543 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,4 +1,2 @@ -DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9 SHA512 a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288 -DIST geeqie-2.0.1.tar.xz 100 BLAKE2B e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958 SHA512 cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5 DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch deleted file mode 100644 index bf6a7d77975f.. --- a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh2022-08-12 11:32:26.0 +0200 -+++ geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh 2022-10-17 23:04:08.203219782 +0200 -@@ -12,9 +12,12 @@ - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # GNU General Public License for more details. - -+# Allow standalone replacement for xxd -+command -v xxdi.pl >/dev/null 2>&1 && XXD="xxdi.pl" || XXD="xxd -i" -+ - # To generate the required code, xxd has to run in the same folder as the source - build_dir="$PWD" - - cd "$(dirname "$1")" || return 1 - --xxd -i "$(basename "$1")" "$build_dir/$2" -+${XXD} "$(basename "$1")" > "$build_dir/$2" diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch b/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch deleted file mode 100644 index e12ab036b4c9.. --- a/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Naur geeqie-2.0.1.orig/doc/meson.build geeqie-2.0.1/doc/meson.build geeqie-2.0.1.orig/doc/meson.build 2022-08-12 11:32:25.0 +0200 -+++ geeqie-2.0.1/doc/meson.build 2022-10-18 16:26:33.776338232 +0200 -@@ -20,21 +20,16 @@ - guideindex_ln = join_paths(destdir, 'index.html') - - # Not-found notification already handled by ../meson.build --if gnome_doc_tool.found() -+if not get_option('doc').disabled() and gnome_doc_tool.found() - run_command(gnome_doc_tool, 'html', '-o', destdir, '-p', iconsdir, guideindex_xml, check : false) - run_command(find_program('ln'), '-s', '-f', guideindex_html, guideindex_ln, check : false) - endif - - install_subdir(destdir, install_dir : helpdir, exclude_directories : 'lua-api/latex') - --doxygen = find_program('doxygen', required : false) --if doxygen.found() -+if not get_option('doc').disabled() and doxygen.found() - srcdir = join_paths(meson.source_root()) - destdir = join_paths(meson.build_root(), 'doc', 'html', 'lua-api') - - run_command(find_program('create-doxygen-lua-api.sh'), srcdir, destdir, check : false) -- --summary({'lua-api' : ['lua-api help file created:', true]}, section : 'Documentation', bool_yn : true) --else --summary({'lua-api' : ['doxygen not found - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true) - endif -diff -Naur geeqie-2.0.1.orig/meson.build geeqie-2.0.1/meson.build
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: c3789e85b9d1d2b3d44fd2eb27188a7f3eee29aa Author: Sam James gentoo org> AuthorDate: Thu Jan 11 09:36:30 2024 + Commit: Sam James gentoo org> CommitDate: Thu Jan 11 09:36:30 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3789e85 media-gfx/geeqie: Stabilize 2.1-r1 x86, #915452 Signed-off-by: Sam James gentoo.org> media-gfx/geeqie/geeqie-2.1-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/geeqie/geeqie-2.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.1-r1.ebuild index b933667c4f38..9acadcda8fe6 100644 --- a/media-gfx/geeqie/geeqie-2.1-r1.ebuild +++ b/media-gfx/geeqie/geeqie-2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc ~x86" +KEYWORDS="amd64 ~arm64 ~ppc x86" IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: db6b9cb656730dfb3565b9980ab6de25f80a3fea Author: Michał Górny gentoo org> AuthorDate: Sun Oct 22 12:50:20 2023 + Commit: Michał Górny gentoo org> CommitDate: Fri Oct 27 15:18:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db6b9cb6 media-gfx/geeqie: Remove redundant local flag descs Signed-off-by: Michał Górny gentoo.org> media-gfx/geeqie/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml index 2b948d61d941..d018999e1d80 100644 --- a/media-gfx/geeqie/metadata.xml +++ b/media-gfx/geeqie/metadata.xml @@ -8,7 +8,6 @@ Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool Enable video thumbnail support with media-video/ffmpegthumbnailer - Enable support for JPEG XL image format Enable items GPS map display
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 41fb28e1009710d7d28dbaa13f0a6d60ad6d5e59 Author: Sam James gentoo org> AuthorDate: Mon Oct 9 20:01:21 2023 + Commit: Sam James gentoo org> CommitDate: Mon Oct 9 20:01:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41fb28e1 media-gfx/geeqie: Stabilize 2.1-r1 amd64, #915452 Signed-off-by: Sam James gentoo.org> media-gfx/geeqie/geeqie-2.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-2.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.1-r1.ebuild index ef29faa38032..b933667c4f38 100644 --- a/media-gfx/geeqie/geeqie-2.1-r1.ebuild +++ b/media-gfx/geeqie/geeqie-2.1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +KEYWORDS="amd64 ~arm64 ~ppc ~x86" IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 51b41ba786cfe6298c7c3ccc8f85315da7e53439 Author: Sam James gentoo org> AuthorDate: Tue Aug 22 11:59:42 2023 + Commit: Sam James gentoo org> CommitDate: Tue Aug 22 11:59:42 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b41ba7 media-gfx/geeqie: Stabilize 2.1 x86, #912689 Signed-off-by: Sam James gentoo.org> media-gfx/geeqie/geeqie-2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-2.1.ebuild b/media-gfx/geeqie/geeqie-2.1.ebuild index b06a0c334718..51a0ef4fdf25 100644 --- a/media-gfx/geeqie/geeqie-2.1.ebuild +++ b/media-gfx/geeqie/geeqie-2.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc ~x86" +KEYWORDS="amd64 ~arm64 ~ppc x86" IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 51ad320d382d2f46d88d80fcf37fa5799bae1ce6 Author: Sam James gentoo org> AuthorDate: Tue Aug 22 11:59:41 2023 + Commit: Sam James gentoo org> CommitDate: Tue Aug 22 11:59:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51ad320d media-gfx/geeqie: Stabilize 2.1 amd64, #912689 Signed-off-by: Sam James gentoo.org> media-gfx/geeqie/geeqie-2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-2.1.ebuild b/media-gfx/geeqie/geeqie-2.1.ebuild index e9b2253c1d04..b06a0c334718 100644 --- a/media-gfx/geeqie/geeqie-2.1.ebuild +++ b/media-gfx/geeqie/geeqie-2.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +KEYWORDS="amd64 ~arm64 ~ppc ~x86" IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 2d97eafbbb98f127a9329925d23dbf2381b5e12b Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Aug 21 06:51:43 2023 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Aug 21 06:52:05 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d97eafb media-gfx/geeqie: clear unused USE Flag Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml index 280f5ee936ea..2b948d61d941 100644 --- a/media-gfx/geeqie/metadata.xml +++ b/media-gfx/geeqie/metadata.xml @@ -8,7 +8,6 @@ Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool Enable video thumbnail support with media-video/ffmpegthumbnailer - Enable GPU acceleration support - experimental Enable support for JPEG XL image format Enable items GPS map display
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/
commit: 82484bb5f8153ec6e46722f8f26e34acd2b492d5 Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Aug 21 06:51:22 2023 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Aug 21 06:52:05 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82484bb5 media-gfx/geeqie: backport support for exiv2-0.28.0 Signed-off-by: Bernard Cafarelli gentoo.org> .../geeqie/files/geeqie-2.1-exiv2-0.28.0.patch | 151 + media-gfx/geeqie/geeqie-2.1-r1.ebuild | 111 +++ 2 files changed, 262 insertions(+) diff --git a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch b/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch new file mode 100644 index ..13b6a171257d --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch @@ -0,0 +1,151 @@ +From c45cca777aa3477eaf297db99f337e18d9683c61 Mon Sep 17 00:00:00 2001 +From: Kevin Backhouse +Date: Wed, 21 Jun 2023 12:23:33 +0100 +Subject: [PATCH] Add ExifData as extra argument to + exif_item_get_data_as_text(). + +--- + src/advanced-exif.cc | 2 +- + src/exif-common.cc | 2 +- + src/exif.cc | 8 + src/exif.h | 2 +- + src/exiv2.cc | 4 ++-- + 5 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc +index 79a54b12..e3d3067a 100644 +--- a/src/advanced-exif.cc b/src/advanced-exif.cc +@@ -120,7 +120,7 @@ static void advanced_exif_update(ExifWin *ew) + tag = g_strdup_printf("0x%04x", exif_item_get_tag_id(item)); + tag_name = exif_item_get_tag_name(item); + format = exif_item_get_format_name(item, TRUE); +- text = exif_item_get_data_as_text(item); ++ text = exif_item_get_data_as_text(item, exif); + utf8_text = utf8_validate_or_convert(text); + g_free(text); + elements = g_strdup_printf("%d", exif_item_get_elements(item)); +diff --git a/src/exif-common.cc b/src/exif-common.cc +index 6a4c9740..b6f07ca6 100644 +--- a/src/exif-common.cc b/src/exif-common.cc +@@ -995,7 +995,7 @@ gchar *exif_get_data_as_text(ExifData *exif, const gchar *key) + if (key_valid) return text; + + item = exif_get_item(exif, key); +- if (item) return exif_item_get_data_as_text(item); ++ if (item) return exif_item_get_data_as_text(item, exif); + + return nullptr; + } +diff --git a/src/exif.cc b/src/exif.cc +index 8708ff53..cda2cb1a 100644 +--- a/src/exif.cc b/src/exif.cc +@@ -1454,7 +1454,7 @@ gchar *exif_item_get_string(ExifItem *item, gint UNUSED(idx)) + return exif_item_get_data_as_text_full(item, METADATA_PLAIN); + } + +-gchar *exif_item_get_data_as_text(ExifItem *item) ++gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif) + { + return exif_item_get_data_as_text_full(item, METADATA_FORMATTED); + } +@@ -1527,11 +1527,11 @@ gchar *exif_get_tag_description_by_key(const gchar *key) + return NULL; + } + +-static void exif_write_item(FILE *f, ExifItem *item) ++static void exif_write_item(FILE *f, ExifItem *item, ExifData *exif) + { + gchar *text; + +- text = exif_item_get_data_as_text(item); ++ text = exif_item_get_data_as_text(item, exif); + if (text) + { + gchar *tag = exif_item_get_tag_name(item); +@@ -1578,7 +1578,7 @@ void exif_write_data_list(ExifData *exif, FILE *f, gint human_readable_list) + item = (ExifItem*)(work->data); + work = work->next; + +- exif_write_item(f, item); ++ exif_write_item(f, item, exif); + } + } + g_fprintf(f, "\n"); +diff --git a/src/exif.h b/src/exif.h +index fcc7d8f5..4b03c201 100644 +--- a/src/exif.h b/src/exif.h +@@ -136,7 +136,7 @@ gchar *exif_item_get_data(ExifItem *item, guint *data_len); + gchar *exif_item_get_description(ExifItem *item); + guint exif_item_get_format_id(ExifItem *item); + const gchar *exif_item_get_format_name(ExifItem *item, gboolean brief); +-gchar *exif_item_get_data_as_text(ExifItem *item); ++gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif); + gint exif_item_get_integer(ExifItem *item, gint *value); + ExifRational *exif_item_get_rational(ExifItem *item, gint *sign, guint n); + +diff --git a/src/exiv2.cc b/src/exiv2.cc +index 33b779e7..dc62e8e0 100644 +--- a/src/exiv2.cc b/src/exiv2.cc +@@ -778,13 +778,13 @@ const char *exif_item_get_format_name(ExifItem *item, gboolean UNUSED(brief)) + } + + +-gchar *exif_item_get_data_as_text(ExifItem *item) ++gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif) + { + try { + if (!item) return nullptr; + auto metadatum = reinterpret_cast(item); + #if EXIV2_TEST_VERSION(0,17,0) +- return utf8_validate_or_conver
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: f5fcf184d7ad16dfd77d6c46a2aa44933146763f Author: Sam James gentoo org> AuthorDate: Thu Aug 17 03:51:04 2023 + Commit: Sam James gentoo org> CommitDate: Thu Aug 17 03:51:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5fcf184 media-gfx/geeqie: Keyword 2.1 arm64, #910744 Signed-off-by: Sam James gentoo.org> media-gfx/geeqie/geeqie-2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-2.1.ebuild b/media-gfx/geeqie/geeqie-2.1.ebuild index 62d485ca97b3..e9b2253c1d04 100644 --- a/media-gfx/geeqie/geeqie-2.1.ebuild +++ b/media-gfx/geeqie/geeqie-2.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc ~x86" IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: d5030dddcc9ab4029e1c9b9d44216a13080ef980 Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Aug 1 21:57:26 2023 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Aug 1 21:57:42 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5030ddd media-gfx/geeqie: sync live ebuild Bug: https://bugs.gentoo.org/909302 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-.ebuild | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index ae833800a507..80135160f44c 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -26,7 +26,7 @@ RDEPEND="gnome-extra/zenity heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) jpeg? ( media-libs/libjpeg-turbo:= ) - jpegxl? ( >=media-libs/libjxl-0.3.7 ) + jpegxl? ( >=media-libs/libjxl-0.3.7:= ) lcms? ( media-libs/lcms:2 ) lua? ( ${LUA_DEPS} ) map? ( media-libs/clutter-gtk @@ -35,7 +35,7 @@ RDEPEND="gnome-extra/zenity raw? ( >=media-libs/libraw-0.20:= ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:= ) - webp? ( >=media-libs/libwebp-0.6.1:= ) + webp? ( gui-libs/gdk-pixbuf-loader-webp:= ) zip? ( >=app-arch/libarchive-3.4.0 )" DEPEND="${RDEPEND}" BDEPEND=" @@ -54,14 +54,8 @@ pkg_setup() { src_prepare() { default - # Fix xxdi.pl support - sed -e 's/"$build_dir/> \0/' scripts/generate-ClayRGB1998-icc-h.sh || die - # Disable doc build - not useful most of the time per upstream sed -e "/subdir('doc')/d" -i meson.build || die - - # Lua version - sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die } src_configure() { @@ -83,7 +77,6 @@ src_configure() { $(meson_feature raw libraw) $(meson_feature spell) $(meson_feature tiff) - $(meson_feature webp) $(meson_feature zip archive) )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: b8e7ce054f7add45223446468a1e8207bb600494 Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Jul 12 06:52:52 2023 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Jul 18 12:24:58 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8e7ce05 media-gfx/geeqie: drop 1.7.3-r1 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest | 1 - media-gfx/geeqie/geeqie-1.7.3-r1.ebuild | 96 - 2 files changed, 97 deletions(-) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 9f9f10272793..633043002b47 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,4 +1,3 @@ -DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9 SHA512 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9 DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9 SHA512 a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288 DIST geeqie-2.0.1.tar.xz 100 BLAKE2B e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958 SHA512 cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5 DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d diff --git a/media-gfx/geeqie/geeqie-1.7.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.7.3-r1.ebuild deleted file mode 100644 index b4a9dedac418.. --- a/media-gfx/geeqie/geeqie-1.7.3-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -LUA_COMPAT=( lua5-{1..3} ) - -inherit autotools lua-single xdg - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org"; -SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg jpegxl lcms lirc lua map nls pdf tiff xmp" - -RDEPEND=" - virtual/libintl - x11-libs/gtk+:3 - doc? ( app-text/gnome-doc-utils ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - gpu-accel? ( media-libs/clutter-gtk ) - jpeg? ( media-libs/libjpeg-turbo:= ) - jpegxl? ( >=media-libs/libjxl-0.3.7:= ) - lcms? ( media-libs/lcms:2 ) - lirc? ( app-misc/lirc ) - lua? ( ${LUA_DEPS} ) - map? ( media-libs/libchamplain:0.12 ) - pdf? ( >=app-text/poppler-0.62[cairo] ) - tiff? ( media-libs/tiff:= ) - xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - map? ( gpu-accel )" - -src_prepare() { - default - - # Remove -Werror (gcc changes may add new warnings) - sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die - - # Remove force rebuild of Lua API ref - sed -e 's#./create-doxygen-lua-api.sh##' -i doc/Makefile.am || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} - --enable-gtk3 - $(use_enable debug debug-log) - $(use_enable ffmpegthumbnailer) - $(use_enable gpu-accel) - $(use_enable jpeg) - $(use_enable jpegxl) - $(use_enable lcms) - $(use_enable lua) - $(use_enable lirc) - $(use_enable map) - $(use_enable nls) - $(use_enable pdf) - $(use_enable tiff) - ) - - if use exif || use xmp; then - myeconfargs+=( --enable-exiv2 ) - else - myeconfargs+=( --disable-exiv2) - fi - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - rm -f "${D}/usr/share/doc/${PF}/COPYING" || die - # Application needs access to the uncompressed file - docompress -x /usr/share/doc/${PF}/README.md -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "Some plugins may require ad
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: dca7101a5f67256da6412b267582366cc5626cf7 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Jul 10 19:54:01 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Jul 10 19:54:01 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dca7101a media-gfx/geeqie: Stabilize 2.0.1-r4 x86, #906505 Signed-off-by: Arthur Zamarin gentoo.org> media-gfx/geeqie/geeqie-2.0.1-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild index d6b786d4c4c9..ed4f98a13ba5 100644 --- a/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild +++ b/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
commit: fb6f43da4a1fa2c3d442baaa32016593bbe816e1 Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Jul 7 16:43:55 2023 + Commit: Bernard Cafarelli gentoo org> CommitDate: Fri Jul 7 16:45:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb6f43da media-gfx/geeqie: use lua.hpp to fix lua plugin compilation This can be replaced later by upstream official fix Bug: https://bugs.gentoo.org/909302 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch | 19 +++ media-gfx/geeqie/geeqie-2.1.ebuild | 7 --- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch new file mode 100644 index ..a0c816b5fb3c --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch @@ -0,0 +1,19 @@ +--- + src/lua.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/lua.cc b/src/lua.cc +index 84aa549a..458b658a 100644 +--- a/src/lua.cc b/src/lua.cc +@@ -24,9 +24,7 @@ + + #define _XOPEN_SOURCE + +-#include +-#include +-#include ++#include + + #include + #include diff --git a/media-gfx/geeqie/geeqie-2.1.ebuild b/media-gfx/geeqie/geeqie-2.1.ebuild index 9553979fc1d4..62d485ca97b3 100644 --- a/media-gfx/geeqie/geeqie-2.1.ebuild +++ b/media-gfx/geeqie/geeqie-2.1.ebuild @@ -45,6 +45,10 @@ BDEPEND=" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" +PATCHES=( + "${FILESDIR}"/${P}-lua_hpp.patch +) + pkg_setup() { # Do not require setting LUA_SINGLE_TARGET if lua is not used use lua && lua-single_pkg_setup @@ -55,9 +59,6 @@ src_prepare() { # Disable doc build - not useful most of the time per upstream sed -e "/subdir('doc')/d" -i meson.build || die - - # Lua version - sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: a19537cbd86c150710aad4e5ecea1d2386c689da Author: Cristian Othón Martínez Vera cfuga mx> AuthorDate: Mon Jun 26 22:28:07 2023 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Jun 27 11:10:34 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a19537cb media-gfx/geeqie: fix implicit dep on media-libs/libjxl for media-gfx/geeqie-1.7.3 Signed-off-by: Cristian Othón Martínez Vera cfuga.mx> Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-1.7.3-r1.ebuild | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media-gfx/geeqie/geeqie-1.7.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.7.3-r1.ebuild index 497e93cb39b3..b4a9dedac418 100644 --- a/media-gfx/geeqie/geeqie-1.7.3-r1.ebuild +++ b/media-gfx/geeqie/geeqie-1.7.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp" +IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg jpegxl lcms lirc lua map nls pdf tiff xmp" RDEPEND=" virtual/libintl @@ -22,6 +22,7 @@ RDEPEND=" ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) jpeg? ( media-libs/libjpeg-turbo:= ) + jpegxl? ( >=media-libs/libjxl-0.3.7:= ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( ${LUA_DEPS} ) @@ -60,6 +61,7 @@ src_configure() { $(use_enable ffmpegthumbnailer) $(use_enable gpu-accel) $(use_enable jpeg) + $(use_enable jpegxl) $(use_enable lcms) $(use_enable lua) $(use_enable lirc)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 468c87c2c89aa8121523de8f8d53ffa0749526bd Author: Cristian Othón Martínez Vera cfuga mx> AuthorDate: Mon Jun 26 22:33:27 2023 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Jun 27 11:10:34 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=468c87c2 media-gfx/geeqie: subscribe to media-libs/libjxl subslot Signed-off-by: Cristian Othón Martínez Vera cfuga.mx> Closes: https://github.com/gentoo/gentoo/pull/31634 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-2.0.1-r4.ebuild | 2 +- media-gfx/geeqie/geeqie-2.1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild index ec2256cdf1a9..d6b786d4c4c9 100644 --- a/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild +++ b/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild @@ -25,7 +25,7 @@ RDEPEND="gnome-extra/zenity heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) jpeg? ( media-libs/libjpeg-turbo:= ) - jpegxl? ( >=media-libs/libjxl-0.3.7 ) + jpegxl? ( >=media-libs/libjxl-0.3.7:= ) lcms? ( media-libs/lcms:2 ) lua? ( ${LUA_DEPS} ) map? ( media-libs/clutter-gtk diff --git a/media-gfx/geeqie/geeqie-2.1.ebuild b/media-gfx/geeqie/geeqie-2.1.ebuild index 39304925ce9d..9553979fc1d4 100644 --- a/media-gfx/geeqie/geeqie-2.1.ebuild +++ b/media-gfx/geeqie/geeqie-2.1.ebuild @@ -25,7 +25,7 @@ RDEPEND="gnome-extra/zenity heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) jpeg? ( media-libs/libjpeg-turbo:= ) - jpegxl? ( >=media-libs/libjxl-0.3.7 ) + jpegxl? ( >=media-libs/libjxl-0.3.7:= ) lcms? ( media-libs/lcms:2 ) lua? ( ${LUA_DEPS} ) map? ( media-libs/clutter-gtk
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: ad54850eaa238201fe312e5e18282358e94409bf Author: Sam James gentoo org> AuthorDate: Tue Jun 27 10:37:57 2023 + Commit: Sam James gentoo org> CommitDate: Tue Jun 27 10:55:42 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad54850e media-gfx/geeqie: destabilize 2.1 for ~amd64 Signed-off-by: Sam James gentoo.org> media-gfx/geeqie/geeqie-2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-2.1.ebuild b/media-gfx/geeqie/geeqie-2.1.ebuild index 43bd977b6123..39304925ce9d 100644 --- a/media-gfx/geeqie/geeqie-2.1.ebuild +++ b/media-gfx/geeqie/geeqie-2.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 3d67bd2f40d20d41d29315a7d1567b6a81f74719 Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Jun 27 10:34:31 2023 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Jun 27 10:34:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d67bd2f media-gfx/geeqie: add 2.1 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest | 2 + media-gfx/geeqie/geeqie-2.1.ebuild | 109 + 2 files changed, 111 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 212a13e2c4ee..9f9f10272793 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,3 +1,5 @@ DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9 SHA512 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9 DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9 SHA512 a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288 DIST geeqie-2.0.1.tar.xz 100 BLAKE2B e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958 SHA512 cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5 +DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d +DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f diff --git a/media-gfx/geeqie/geeqie-2.1.ebuild b/media-gfx/geeqie/geeqie-2.1.ebuild new file mode 100644 index ..43bd977b6123 --- /dev/null +++ b/media-gfx/geeqie/geeqie-2.1.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +LUA_COMPAT=( lua5-{3,4} ) + +inherit lua-single meson optfeature xdg + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc ~x86" +IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" + +RDEPEND="gnome-extra/zenity + virtual/libintl + x11-libs/gtk+:3 + djvu? ( app-text/djvu ) + exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + heif? ( >=media-libs/libheif-1.3.2 ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpegxl? ( >=media-libs/libjxl-0.3.7 ) + lcms? ( media-libs/lcms:2 ) + lua? ( ${LUA_DEPS} ) + map? ( media-libs/clutter-gtk + media-libs/libchamplain:0.12[gtk] ) + pdf? ( >=app-text/poppler-0.62[cairo] ) + raw? ( >=media-libs/libraw-0.20:= ) + spell? ( app-text/gspell ) + tiff? ( media-libs/tiff:= ) + webp? ( gui-libs/gdk-pixbuf-loader-webp:= ) + zip? ( >=app-arch/libarchive-3.4.0 )" +DEPEND="${RDEPEND}" +BDEPEND=" + || ( dev-util/xxdi app-editors/vim-core ) + dev-util/glib-utils + sys-devel/gettext + virtual/pkgconfig" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +pkg_setup() { + # Do not require setting LUA_SINGLE_TARGET if lua is not used + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + + # Disable doc build - not useful most of the time per upstream + sed -e "/subdir('doc')/d" -i meson.build || die + + # Lua version + sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die +} + +src_configure() { + local emesonargs=( + -Dgq_helpdir="share/doc/${PF}" + -Dgq_htmldir="share/doc/${PF}/html" + $(meson_use debug) + $(meson_feature djvu) + $(meson_feature exif exiv2) + $(meson_feature ffmpegthumbnailer videothumbnailer) + $(meson_feature heif) + $(meson_feature jpeg) + $(meson_feature jpeg2k j2k) +
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 67063b1e4321fb16375897a7953d9909cf876a16 Author: Sam James gentoo org> AuthorDate: Sun May 28 23:32:30 2023 + Commit: Sam James gentoo org> CommitDate: Sun May 28 23:32:30 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67063b1e media-gfx/geeqie: Stabilize 2.0.1-r4 amd64, #906505 Signed-off-by: Sam James gentoo.org> media-gfx/geeqie/geeqie-2.0.1-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild index 1efc3af9dd12..ec2256cdf1a9 100644 --- a/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild +++ b/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: aa640d34f7e7b6369c26a602de52bd8e028fc0eb Author: Sam James gentoo org> AuthorDate: Sat May 6 11:13:17 2023 + Commit: Sam James gentoo org> CommitDate: Sat May 6 11:33:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa640d34 media-gfx/geeqie: drop stale dev-util/intltool dep Signed-off-by: Sam James gentoo.org> media-gfx/geeqie/{geeqie-2.0.1-r3.ebuild => geeqie-2.0.1-r4.ebuild} | 3 +-- media-gfx/geeqie/geeqie-.ebuild | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/media-gfx/geeqie/geeqie-2.0.1-r3.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild similarity index 98% rename from media-gfx/geeqie/geeqie-2.0.1-r3.ebuild rename to media-gfx/geeqie/geeqie-2.0.1-r4.ebuild index f16b53d0df1e..1efc3af9dd12 100644 --- a/media-gfx/geeqie/geeqie-2.0.1-r3.ebuild +++ b/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -40,7 +40,6 @@ DEPEND="${RDEPEND}" BDEPEND=" || ( dev-util/xxdi app-editors/vim-core ) dev-util/glib-utils - dev-util/intltool sys-devel/gettext virtual/pkgconfig" diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index c6f4c4adff37..ae833800a507 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -41,7 +41,6 @@ DEPEND="${RDEPEND}" BDEPEND=" || ( dev-util/xxdi app-editors/vim-core ) dev-util/glib-utils - dev-util/intltool sys-devel/gettext virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 404b9c083c65174206f149b50c85e452dfc7796c Author: Sam James gentoo org> AuthorDate: Sat May 6 11:32:57 2023 + Commit: Sam James gentoo org> CommitDate: Sat May 6 11:33:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=404b9c08 media-gfx/geeqie: add github upstream metadata Signed-off-by: Sam James gentoo.org> media-gfx/geeqie/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml index fe79e449c2dc..280f5ee936ea 100644 --- a/media-gfx/geeqie/metadata.xml +++ b/media-gfx/geeqie/metadata.xml @@ -12,4 +12,7 @@ Enable support for JPEG XL image format Enable items GPS map display + + BestImageViewer/geeqie +
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: d301b8b8c31d91d4853d941467bb321247f92c88 Author: Sam James gentoo org> AuthorDate: Fri Dec 16 04:26:08 2022 + Commit: Sam James gentoo org> CommitDate: Fri Dec 16 04:29:20 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d301b8b8 media-gfx/geeqie: unrevbump Unintentional, was defect in script for libtiff revbumps (fixed already for next time.) Signed-off-by: Sam James gentoo.org> media-gfx/geeqie/{geeqie--r1.ebuild => geeqie-.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media-gfx/geeqie/geeqie--r1.ebuild b/media-gfx/geeqie/geeqie-.ebuild similarity index 100% rename from media-gfx/geeqie/geeqie--r1.ebuild rename to media-gfx/geeqie/geeqie-.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 1a2231966b4551afabc3074b2975ce5aaa037c3e Author: Bernard Cafarelli gentoo org> AuthorDate: Sun Nov 6 20:04:28 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Sun Nov 6 20:05:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a223196 media-gfx/geeqie: drop media-gfx/ufraw suggestion Package is not in tree anymore, newer geeqie versions use media-libs/libraw instead Closes: https://bugs.gentoo.org/880025 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-1.7.3.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-1.7.3.ebuild b/media-gfx/geeqie/geeqie-1.7.3.ebuild index fe7f727326ff..4d5b5b986aec 100644 --- a/media-gfx/geeqie/geeqie-1.7.3.ebuild +++ b/media-gfx/geeqie/geeqie-1.7.3.ebuild @@ -91,5 +91,4 @@ pkg_postinst() { elog "Some plugins may require additional packages" elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" - elog "- RAW images plugin: media-gfx/ufraw" }
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/
commit: 92f3e7f2f6f53346dfbebd12f75b5266bbfc97d5 Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Oct 24 21:28:54 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Oct 24 21:29:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f3e7f2 media-gfx/geeqie: fix xxdi.pl support Also sync doc drop from live ebuild Closes: https://bugs.gentoo.org/878089 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch | 2 +- media-gfx/geeqie/geeqie-2.0.1-r1.ebuild | 10 +- media-gfx/geeqie/geeqie-.ebuild | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch index 440de7189344..bf6a7d77975f 100644 --- a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch +++ b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch @@ -14,4 +14,4 @@ diff -Naur geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh geeqie-2.0.1/ cd "$(dirname "$1")" || return 1 -xxd -i "$(basename "$1")" "$build_dir/$2" -+${XXD} "$(basename "$1")" "$build_dir/$2" ++${XXD} "$(basename "$1")" > "$build_dir/$2" diff --git a/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild index 8a99ae4480da..7dcf1197b2ae 100644 --- a/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild +++ b/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild @@ -14,13 +14,12 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" +IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) - doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) @@ -28,8 +27,7 @@ RDEPEND="gnome-extra/zenity jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) - lua? ( ${LUA_DEPS} - doc? ( app-doc/doxygen ) ) + lua? ( ${LUA_DEPS} ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) @@ -61,6 +59,9 @@ pkg_setup() { src_prepare() { default + # Disable doc build - not useful most of the time per upstream + sed -e "/subdir('doc')/d" -i meson.build || die + # Lua version sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die } @@ -71,7 +72,6 @@ src_configure() { -Dgq_htmldir="share/doc/${PF}/html" $(meson_use debug) $(meson_feature djvu) - $(meson_feature doc) $(meson_feature exif exiv2) $(meson_feature ffmpegthumbnailer videothumbnailer) $(meson_feature heif) diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index ffac439db08a..9d85f853281b 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -55,6 +55,9 @@ pkg_setup() { src_prepare() { default + # Fix xxdi.pl support + sed -e 's/"$build_dir/> \0/' scripts/generate-ClayRGB1998-icc-h.sh || die + # Disable doc build - not useful most of the time per upstream sed -e "/subdir('doc')/d" -i meson.build || die
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: c95710cb3b508679147a49d6210a0176b223328b Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Oct 24 21:03:24 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Oct 24 21:29:26 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95710cb media-gfx/geeqie: drop doc build in live ebuild Per upstream: The Help files are not so important - when running Geeqie the Help menu item defaults to the web version if there are no local help files. The Lua help files are probably not important (yet). Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-.ebuild | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index 2be0f992fee3..ffac439db08a 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -15,13 +15,12 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"; LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" +IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) - doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) @@ -29,8 +28,7 @@ RDEPEND="gnome-extra/zenity jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) - lua? ( ${LUA_DEPS} - doc? ( app-doc/doxygen ) ) + lua? ( ${LUA_DEPS} ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) @@ -57,6 +55,9 @@ pkg_setup() { src_prepare() { default + # Disable doc build - not useful most of the time per upstream + sed -e "/subdir('doc')/d" -i meson.build || die + # Lua version sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die } @@ -67,7 +68,6 @@ src_configure() { -Dgq_htmldir="share/doc/${PF}/html" $(meson_use debug) $(meson_feature djvu) - $(meson_feature doc) $(meson_feature exif exiv2) $(meson_feature ffmpegthumbnailer videothumbnailer) $(meson_feature heif)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/
commit: 21fc342983e74aa9f69f3f1293edba0d582d7ae1 Author: Bernard Cafarelli gentoo org> AuthorDate: Thu Oct 20 11:41:40 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Thu Oct 20 11:41:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21fc3429 media-gfx/geeqie: drop 1.5.1-r1, 1.6-r1, 1.6_p20211016, 1.7.2 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest | 4 - .../geeqie/files/geeqie-1.5.1-no_common.patch | 75 - media-gfx/geeqie/files/geeqie-1.6-yelp.patch | 25 -- media-gfx/geeqie/geeqie-1.5.1-r1.ebuild| 96 - media-gfx/geeqie/geeqie-1.6-r1.ebuild | 91 media-gfx/geeqie/geeqie-1.6_p20211016.ebuild | 97 -- media-gfx/geeqie/geeqie-1.7.2.ebuild | 95 - media-gfx/geeqie/metadata.xml | 1 - 8 files changed, 484 deletions(-) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 103cf41721d8..212a13e2c4ee 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,7 +1,3 @@ -DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac -DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef -DIST geeqie-1.6_p20211016.tar.xz 36433388 BLAKE2B e8932398ce7354c08ad4199834870e2844555ee1a8ae2beebd9a512100784a5cb62e00993b3ef1854a7ab1bd37eb0742ebcfc17605429f99b61e1af2fbaf859e SHA512 9e536beac39028fdcbe04d014460de2b02039b2c027f9603a71554339b2d14116f8dff11bb09c6e73d51550188daf40031535f978fbbc2d355d30593f4f29e9d -DIST geeqie-1.7.2.tar.xz 1949240 BLAKE2B 4dde2c902151da677470dca359b321978afe861cafddb7baf76e68acc8a9cf7943ce8ebd8e46aa007a773cce62444d16908d1b8b1339de58587c98d911775ec7 SHA512 07b06ef51cb520b91b9097bbe06d170af39d3d513d9853c912e1b60bd5b47e0ae3571f6ac449c9f9c6cee4d227fc4c906ee5f90f7498cd0b2119d12ff4673c4d DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9 SHA512 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9 DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9 SHA512 a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288 DIST geeqie-2.0.1.tar.xz 100 BLAKE2B e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958 SHA512 cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5 diff --git a/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch b/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch deleted file mode 100644 index 058e22686250.. --- a/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 543ea6d903a50c353d9e129d380240f277a670aa Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Thu, 23 Jan 2020 08:24:52 + -Subject: [PATCH] src/options: fix build failure against gcc-10 - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` - CXXLDgeeqie -ld: ui_fileops.o:(.bss+0x0): - multiple definition of `options'; ui_bookmark.o:(.bss+0x0): first defined here -ld: ui_fileops.o:(.bss+0x8): - multiple definition of `command_line'; ui_bookmark.o:(.bss+0x8): first defined here -``` - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Reported-by: Anthony Parsons -Bug: https://bugs.gentoo.org/706132 -Signed-off-by: Sergei Trofimovich - src/bar_exif.h | 3 --- - src/options.c | 3 +++ - src/options.h | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/bar_exif.h b/src/bar_exif.h -index 63c30d4b..1395e842 100644 a/src/bar_exif.h -+++ b/src/bar_exif.h -@@ -28,9 +28,6 @@ void bar_pane_exif_update_from_config(GtkWidget *pane, const gchar **attribute_n - void bar_pane_exif_entry_add_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values); - - /* these are exposed for when duplication of the exif bar's text is
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 0554c30f9514be093eef55585ccc3db6c2085f6f Author: Jakov Smolić gentoo org> AuthorDate: Thu Oct 20 10:55:38 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Thu Oct 20 10:55:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0554c30f media-gfx/geeqie: Stabilize 1.7.3 x86, #877489 Signed-off-by: Jakov Smolić gentoo.org> media-gfx/geeqie/geeqie-1.7.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-1.7.3.ebuild b/media-gfx/geeqie/geeqie-1.7.3.ebuild index 93ccfc1c54d8..fe7f727326ff 100644 --- a/media-gfx/geeqie/geeqie-1.7.3.ebuild +++ b/media-gfx/geeqie/geeqie-1.7.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: b4ffc724629fd95f1cc2cb7b00ed405ac464447e Author: Jakov Smolić gentoo org> AuthorDate: Thu Oct 20 10:51:31 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Thu Oct 20 10:51:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ffc724 media-gfx/geeqie: Stabilize 1.7.3 amd64, #877489 Signed-off-by: Jakov Smolić gentoo.org> media-gfx/geeqie/geeqie-1.7.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-1.7.3.ebuild b/media-gfx/geeqie/geeqie-1.7.3.ebuild index 60becabb68fa..93ccfc1c54d8 100644 --- a/media-gfx/geeqie/geeqie-1.7.3.ebuild +++ b/media-gfx/geeqie/geeqie-1.7.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 176e190249d64e85538200f6fcf252e049f4b2a7 Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Oct 19 12:31:28 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Wed Oct 19 12:31:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=176e1902 media-gfx/geeqie: xxdi patch is merged upstream Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-.ebuild | 4 1 file changed, 4 deletions(-) diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index 5a49b5e60c1c..2be0f992fee3 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -49,10 +49,6 @@ BDEPEND=" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" -PATCHES=( - "${FILESDIR}/${PN}-2.0.1-allow_xxdi.patch" -) - pkg_setup() { # Do not require setting LUA_SINGLE_TARGET if lua is not used use lua && lua-single_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
commit: 93a6d36e174bd835bd6d81f34991dd88575024b3 Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Oct 18 14:40:28 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Oct 18 14:56:09 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a6d36e media-gfx/geeqie: Do not check LUA_SINGLE_TARGET with USE=-lua Add build option for doc Fix USE=map dependencies (and remove USE=gpu-accel) Closes: https://bugs.gentoo.org/877545 Closes: https://bugs.gentoo.org/877553 Signed-off-by: Bernard Cafarelli gentoo.org> .../geeqie/files/geeqie-2.0.1-doc_option.patch | 81 ++ ...{geeqie-2.0.1.ebuild => geeqie-2.0.1-r1.ebuild} | 28 +--- media-gfx/geeqie/geeqie-.ebuild| 32 + media-gfx/geeqie/metadata.xml | 4 +- 4 files changed, 118 insertions(+), 27 deletions(-) diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch b/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch new file mode 100644 index ..e12ab036b4c9 --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch @@ -0,0 +1,81 @@ +diff -Naur geeqie-2.0.1.orig/doc/meson.build geeqie-2.0.1/doc/meson.build +--- geeqie-2.0.1.orig/doc/meson.build 2022-08-12 11:32:25.0 +0200 geeqie-2.0.1/doc/meson.build 2022-10-18 16:26:33.776338232 +0200 +@@ -20,21 +20,16 @@ + guideindex_ln = join_paths(destdir, 'index.html') + + # Not-found notification already handled by ../meson.build +-if gnome_doc_tool.found() ++if not get_option('doc').disabled() and gnome_doc_tool.found() + run_command(gnome_doc_tool, 'html', '-o', destdir, '-p', iconsdir, guideindex_xml, check : false) + run_command(find_program('ln'), '-s', '-f', guideindex_html, guideindex_ln, check : false) + endif + + install_subdir(destdir, install_dir : helpdir, exclude_directories : 'lua-api/latex') + +-doxygen = find_program('doxygen', required : false) +-if doxygen.found() ++if not get_option('doc').disabled() and doxygen.found() + srcdir = join_paths(meson.source_root()) + destdir = join_paths(meson.build_root(), 'doc', 'html', 'lua-api') + + run_command(find_program('create-doxygen-lua-api.sh'), srcdir, destdir, check : false) +- +-summary({'lua-api' : ['lua-api help file created:', true]}, section : 'Documentation', bool_yn : true) +-else +-summary({'lua-api' : ['doxygen not found - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true) + endif +diff -Naur geeqie-2.0.1.orig/meson.build geeqie-2.0.1/meson.build +--- geeqie-2.0.1.orig/meson.build 2022-08-12 11:32:25.0 +0200 geeqie-2.0.1/meson.build 2022-10-18 16:25:38.063273607 +0200 +@@ -62,12 +62,6 @@ + # External programs + gdk_pixbuf_csource = find_program('gdk-pixbuf-csource', required : true) + glib_genmarshal = find_program('glib-genmarshal', required : true) +-gnome_doc_tool = find_program('yelp-build', required : false) +-if gnome_doc_tool.found() +-summary({'help' : ['Help files created:', true]}, section : 'Documentation', bool_yn : true) +-else +-summary({'help' : ['yelp-build not found - Help files created:', false]}, section : 'Documentation', bool_yn : true) +-endif + + debug = get_option('debug') + +@@ -138,6 +132,26 @@ + gtk_dep = dependency('gtk+-3.0', version : '>=3.22', required: true) + glib_dep = dependency('glib-2.0', version : '>=2.52', required: true) + ++#option = get_option('doc') ++if not get_option('doc').disabled() ++gnome_doc_tool = find_program('yelp-build', required : false) ++if gnome_doc_tool.found() ++summary({'help' : ['Help files created:', true]}, section : 'Documentation', bool_yn : true) ++else ++summary({'help' : ['yelp-build not found - Help files created:', false]}, section : 'Documentation', bool_yn : true) ++endif ++ ++doxygen = find_program('doxygen', required : false) ++if doxygen.found() ++summary({'lua-api' : ['lua-api help file created:', true]}, section : 'Documentation', bool_yn : true) ++else ++summary({'lua-api' : ['doxygen not found - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true) ++endif ++else ++summary({'help' : ['disabled - Help files created:', false]}, section : 'Documentation', bool_yn : true) ++summary({'lua-api' : ['disabled - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true) ++endif ++ + libarchive_dep = [] + req_version = '>=3.4.0' + option = get_option('archive') +diff -Naur geeqie-2.0.1.orig/meson_options.txt geeqie-2.0.1/meson_options.txt +--- geeqie-2.0.1.orig/meson_options.txt2022-08-12 11:32:25.0 +0200 geeqie-2.0.1/meson_options.txt 2022-10-18 16:25:38.063273607 +0200 +@@ -26,6 +26,7 @@ + option('archive', type : 'feature', value : 'auto', description : 'archive files e.g. zip, gz') + option('cms', type : 'feature', value : 'auto', description
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 2547c19ad970f833e85ab4af830f6fea3a0f831d Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Oct 18 06:55:42 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Oct 18 06:56:24 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2547c19a media-gfx/geeqie: fix SRC_URI for ChangeLog tarball Closes: https://bugs.gentoo.org/877529 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-2.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-2.0.1.ebuild b/media-gfx/geeqie/geeqie-2.0.1.ebuild index 4f6f2af33d64..0e4c3907aa5c 100644 --- a/media-gfx/geeqie/geeqie-2.0.1.ebuild +++ b/media-gfx/geeqie/geeqie-2.0.1.ebuild @@ -9,7 +9,7 @@ inherit lua-single meson optfeature xdg DESCRIPTION="A lightweight GTK image viewer forked from GQview" HOMEPAGE="http://www.geeqie.org"; SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz - https://dev.gentoo.org/~voyageur/${P}-ChangeLog.tar.gz"; + https://dev.gentoo.org/~voyageur/distfiles/${P}-ChangeLog.tar.gz"; LICENSE="GPL-2" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: ef464ab10edacff812f00f6cb4b2fecc1a70c8cb Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Oct 17 21:34:37 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Oct 17 21:38:58 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef464ab1 media-gfx/geeqie: sync live ebuild Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-.ebuild | 103 +--- 1 file changed, 59 insertions(+), 44 deletions(-) diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index e97db26b4d23..2c4b54ad1991 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -LUA_COMPAT=( lua5-{1..3} ) +LUA_COMPAT=( lua5-{3,4} ) -inherit autotools git-r3 lua-single xdg +inherit git-r3 lua-single meson optfeature xdg DESCRIPTION="A lightweight GTK image viewer forked from GQview" HOMEPAGE="http://www.geeqie.org"; @@ -15,80 +15,95 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"; LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp" +IUSE="debug doc djvu exif ffmpegthumbnailer gpu-accel heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" -RDEPEND=" +RDEPEND="gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 - doc? ( app-text/gnome-doc-utils ) + djvu? ( app-text/djvu ) + doc? ( app-text/yelp-tools ) + exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) - jpeg? ( virtual/jpeg:0 ) + heif? ( >=media-libs/libheif-1.3.2 ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) - lirc? ( app-misc/lirc ) - lua? ( ${LUA_DEPS} ) + lua? ( ${LUA_DEPS} + doc? ( app-doc/doxygen ) ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) + raw? ( >=media-libs/libraw-0.20 ) + spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) - xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" + webp? ( >=media-libs/libwebp-0.6.1 ) + zip? ( >=app-arch/libarchive-3.4.0 )" DEPEND="${RDEPEND}" BDEPEND=" + || ( dev-util/xxdi app-editors/vim-core ) dev-util/glib-utils dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext )" + sys-devel/gettext + virtual/pkgconfig" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) map? ( gpu-accel )" +PATCHES=( + "${FILESDIR}/${PN}-2.0.1-allow_xxdi.patch" +) + src_prepare() { default - # Remove -Werror (gcc changes may add new warnings) - sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die - - eautoreconf + # Lua version + sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die } src_configure() { - local myeconfargs=( - --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} - --enable-gtk3 - $(use_enable debug debug-log) - $(use_enable ffmpegthumbnailer) - $(use_enable gpu-accel) - $(use_enable jpeg) - $(use_enable lcms) - $(use_enable lua) - $(use_enable lirc) - $(use_enable map) - $(use_enable nls) - $(use_enable pdf) - $(use_enable tiff) + local emesonargs=( + -Dgq_helpdir="share/doc/${PF}" + -Dgq_htmldir="share/doc/${PF}/html" + $(meson_use debug) + $(meson_feature zip archive) + $(meson_feature lcms cms) + $(meson_feature djvu) + $(meson_feature exif exiv2) + $(meson_feature ffmpegthumbnailer videothumbnailer) + $(meson_feature gpu-accel gps-map) + $(meson_feature heif) + $(meson_feature jpeg2k j2k) + $(meson_feature jpeg) + $(meson_feature jpegxl) + $(meson_feature raw libraw) + $(meson_feature lua) + $(meson_feature pdf) + $(meson_feature spell) + $(meson_feature tiff) + $(meson_feature webp) ) - if use exif || use xmp; then - myeconfargs+=( --enable-exiv2 ) - else - myeconfargs+=( --disable-exiv2) - fi - - econf "${myeconfargs[@]}" + meson_src_configure } src_install() { - default + meson_src_inst
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
commit: 5010be8da3881400821413ff328367933908331b Author: Matthew White inventati org> AuthorDate: Sat Aug 27 11:30:58 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Oct 17 21:38:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5010be8d media-gfx/geeqie: 2.0.1 bump version and major ebuild rewrite It is now required to use the meson build system. Multiple new USE flags (and some removed), this version only supports gtk3 Closes: https://bugs.gentoo.org/866968 Closes: https://bugs.gentoo.org/877435 Package-Manager: Portage-3.0.30-r3, Repoman-3.0.3-r2 Signed-off-by: Matteo Bianco inventati.org> Closes: https://github.com/gentoo/gentoo/pull/27033 Co-Authored-By:: Bernard Cafarelli gentoo.org> Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest | 2 + .../geeqie/files/geeqie-2.0.1-allow_xxdi.patch | 17 media-gfx/geeqie/geeqie-2.0.1.ebuild | 110 + media-gfx/geeqie/metadata.xml | 2 + 4 files changed, 131 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index bcf1bedba4d1..103cf41721d8 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -3,3 +3,5 @@ DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55ae DIST geeqie-1.6_p20211016.tar.xz 36433388 BLAKE2B e8932398ce7354c08ad4199834870e2844555ee1a8ae2beebd9a512100784a5cb62e00993b3ef1854a7ab1bd37eb0742ebcfc17605429f99b61e1af2fbaf859e SHA512 9e536beac39028fdcbe04d014460de2b02039b2c027f9603a71554339b2d14116f8dff11bb09c6e73d51550188daf40031535f978fbbc2d355d30593f4f29e9d DIST geeqie-1.7.2.tar.xz 1949240 BLAKE2B 4dde2c902151da677470dca359b321978afe861cafddb7baf76e68acc8a9cf7943ce8ebd8e46aa007a773cce62444d16908d1b8b1339de58587c98d911775ec7 SHA512 07b06ef51cb520b91b9097bbe06d170af39d3d513d9853c912e1b60bd5b47e0ae3571f6ac449c9f9c6cee4d227fc4c906ee5f90f7498cd0b2119d12ff4673c4d DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9 SHA512 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9 +DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9 SHA512 a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288 +DIST geeqie-2.0.1.tar.xz 100 BLAKE2B e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958 SHA512 cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5 diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch new file mode 100644 index ..440de7189344 --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch @@ -0,0 +1,17 @@ +diff -Naur geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh +--- geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh2022-08-12 11:32:26.0 +0200 geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh 2022-10-17 23:04:08.203219782 +0200 +@@ -12,9 +12,12 @@ + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + ++# Allow standalone replacement for xxd ++command -v xxdi.pl >/dev/null 2>&1 && XXD="xxdi.pl" || XXD="xxd -i" ++ + # To generate the required code, xxd has to run in the same folder as the source + build_dir="$PWD" + + cd "$(dirname "$1")" || return 1 + +-xxd -i "$(basename "$1")" "$build_dir/$2" ++${XXD} "$(basename "$1")" "$build_dir/$2" diff --git a/media-gfx/geeqie/geeqie-2.0.1.ebuild b/media-gfx/geeqie/geeqie-2.0.1.ebuild new file mode 100644 index ..4f6f2af33d64 --- /dev/null +++ b/media-gfx/geeqie/geeqie-2.0.1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +LUA_COMPAT=( lua5-{3,4} ) + +inherit lua-single meson optfeature xdg + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~voyageur/${P}-ChangeLog.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc djvu exif ffmpegthumbnailer gpu-accel heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" + +RDEPEND="gnome-extra/zenity + virtual/libintl + x11-libs/gtk+:3 + djvu? ( app-text/djvu ) + doc? ( app-text/yel
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 7ec16ea1f7a64a2495926b1b8b55fbe1ec79fadb Author: Bernard Cafarelli gentoo org> AuthorDate: Thu Apr 21 17:00:55 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Thu Apr 21 17:17:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec16ea1 media-gfx/geeqie: add 1.7.3 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest| 1 + media-gfx/geeqie/geeqie-1.7.3.ebuild | 95 2 files changed, 96 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 21b0b2460541..bcf1bedba4d1 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -2,3 +2,4 @@ DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b623 DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef DIST geeqie-1.6_p20211016.tar.xz 36433388 BLAKE2B e8932398ce7354c08ad4199834870e2844555ee1a8ae2beebd9a512100784a5cb62e00993b3ef1854a7ab1bd37eb0742ebcfc17605429f99b61e1af2fbaf859e SHA512 9e536beac39028fdcbe04d014460de2b02039b2c027f9603a71554339b2d14116f8dff11bb09c6e73d51550188daf40031535f978fbbc2d355d30593f4f29e9d DIST geeqie-1.7.2.tar.xz 1949240 BLAKE2B 4dde2c902151da677470dca359b321978afe861cafddb7baf76e68acc8a9cf7943ce8ebd8e46aa007a773cce62444d16908d1b8b1339de58587c98d911775ec7 SHA512 07b06ef51cb520b91b9097bbe06d170af39d3d513d9853c912e1b60bd5b47e0ae3571f6ac449c9f9c6cee4d227fc4c906ee5f90f7498cd0b2119d12ff4673c4d +DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9 SHA512 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9 diff --git a/media-gfx/geeqie/geeqie-1.7.3.ebuild b/media-gfx/geeqie/geeqie-1.7.3.ebuild new file mode 100644 index ..60becabb68fa --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.7.3.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +LUA_COMPAT=( lua5-{1..3} ) + +inherit autotools lua-single xdg + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp" + +RDEPEND=" + virtual/libintl + x11-libs/gtk+:3 + doc? ( app-text/gnome-doc-utils ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + gpu-accel? ( media-libs/clutter-gtk ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( ${LUA_DEPS} ) + map? ( media-libs/libchamplain:0.12 ) + pdf? ( >=app-text/poppler-0.62[cairo] ) + tiff? ( media-libs/tiff:0 ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + map? ( gpu-accel )" + +src_prepare() { + default + + # Remove -Werror (gcc changes may add new warnings) + sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die + + # Remove force rebuild of Lua API ref + sed -e 's#./create-doxygen-lua-api.sh##' -i doc/Makefile.am || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} + --enable-gtk3 + $(use_enable debug debug-log) + $(use_enable ffmpegthumbnailer) + $(use_enable gpu-accel) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable map) + $(use_enable nls) + $(use_enable pdf) + $(use_enable tiff) + ) + + if use exif || use xmp; then + myeconfargs+=( --enable-exiv2 ) + else + myeconfargs+=( --disable-exiv2) + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + rm -f "${D}/usr/share/doc/${PF}/COPYING" || die + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README.md +} + +pkg_postinst() { + xdg_pkg_postinst + + elog "Some plugins may require additional packages" + elog "- Image ro
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 6d3945dd13aad93eff90d18e3c2f81e6245223db Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Jan 25 22:28:57 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Jan 25 22:29:12 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d3945dd media-gfx/geeqie: 1.7.2 bump Closes: https://bugs.gentoo.org/831636 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest| 1 + media-gfx/geeqie/geeqie-1.7.2.ebuild | 95 2 files changed, 96 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 1daf3e8664f7..21b0b2460541 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,3 +1,4 @@ DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef DIST geeqie-1.6_p20211016.tar.xz 36433388 BLAKE2B e8932398ce7354c08ad4199834870e2844555ee1a8ae2beebd9a512100784a5cb62e00993b3ef1854a7ab1bd37eb0742ebcfc17605429f99b61e1af2fbaf859e SHA512 9e536beac39028fdcbe04d014460de2b02039b2c027f9603a71554339b2d14116f8dff11bb09c6e73d51550188daf40031535f978fbbc2d355d30593f4f29e9d +DIST geeqie-1.7.2.tar.xz 1949240 BLAKE2B 4dde2c902151da677470dca359b321978afe861cafddb7baf76e68acc8a9cf7943ce8ebd8e46aa007a773cce62444d16908d1b8b1339de58587c98d911775ec7 SHA512 07b06ef51cb520b91b9097bbe06d170af39d3d513d9853c912e1b60bd5b47e0ae3571f6ac449c9f9c6cee4d227fc4c906ee5f90f7498cd0b2119d12ff4673c4d diff --git a/media-gfx/geeqie/geeqie-1.7.2.ebuild b/media-gfx/geeqie/geeqie-1.7.2.ebuild new file mode 100644 index ..60becabb68fa --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.7.2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +LUA_COMPAT=( lua5-{1..3} ) + +inherit autotools lua-single xdg + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp" + +RDEPEND=" + virtual/libintl + x11-libs/gtk+:3 + doc? ( app-text/gnome-doc-utils ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + gpu-accel? ( media-libs/clutter-gtk ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( ${LUA_DEPS} ) + map? ( media-libs/libchamplain:0.12 ) + pdf? ( >=app-text/poppler-0.62[cairo] ) + tiff? ( media-libs/tiff:0 ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + map? ( gpu-accel )" + +src_prepare() { + default + + # Remove -Werror (gcc changes may add new warnings) + sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die + + # Remove force rebuild of Lua API ref + sed -e 's#./create-doxygen-lua-api.sh##' -i doc/Makefile.am || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} + --enable-gtk3 + $(use_enable debug debug-log) + $(use_enable ffmpegthumbnailer) + $(use_enable gpu-accel) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable map) + $(use_enable nls) + $(use_enable pdf) + $(use_enable tiff) + ) + + if use exif || use xmp; then + myeconfargs+=( --enable-exiv2 ) + else + myeconfargs+=( --disable-exiv2) + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + rm -f "${D}/usr/share/doc/${PF}/COPYING" || die + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README.md +} + +pkg_postinst() { + xdg_pkg_postinst + + elog "Some plugins may require additional packages" + elog "- Ima
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 2931aee66499cd3d05bf0b1c69fbf892950ada51 Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Dec 29 18:25:02 2021 + Commit: Bernard Cafarelli gentoo org> CommitDate: Wed Dec 29 18:25:17 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2931aee6 media-gfx/geeqie: drop USE=gtk3 in stable 1.6 For gtk3 support, use newer 1.6_p20211016 Bug: https://bugs.gentoo.org/829471 Bug: https://bugs.gentoo.org/830232 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --force Signed-off-by: Bernard Cafarelli gentoo.org> .../geeqie/{geeqie-1.6.ebuild => geeqie-1.6-r1.ebuild} | 17 ++--- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/media-gfx/geeqie/geeqie-1.6.ebuild b/media-gfx/geeqie/geeqie-1.6-r1.ebuild similarity index 83% rename from media-gfx/geeqie/geeqie-1.6.ebuild rename to media-gfx/geeqie/geeqie-1.6-r1.ebuild index 5784fd2b760f..39c6dc86cac5 100644 --- a/media-gfx/geeqie/geeqie-1.6.ebuild +++ b/media-gfx/geeqie/geeqie-1.6-r1.ebuild @@ -13,20 +13,17 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" +IUSE="debug doc exif ffmpegthumbnailer jpeg lcms lirc lua nls pdf tiff xmp" RDEPEND=" virtual/libintl + x11-libs/gtk+:2 doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - gpu-accel? ( media-libs/clutter-gtk ) - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( ${LUA_DEPS} ) - map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) @@ -38,9 +35,7 @@ BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext )" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - gpu-accel? ( gtk3 ) - map? ( gpu-accel )" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" PATCHES=( "${FILESDIR}"/${P}-yelp.patch ) @@ -58,13 +53,13 @@ src_configure() { --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} $(use_enable debug debug-log) $(use_enable ffmpegthumbnailer) - $(use_enable gpu-accel) - $(use_enable gtk3) + --disable-gpu-accel + --disable-gtk3 $(use_enable jpeg) $(use_enable lcms) $(use_enable lua) $(use_enable lirc) - $(use_enable map) + --disable-map $(use_enable nls) $(use_enable pdf) $(use_enable tiff)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 59ceb138d068e061e943211199f26107cb83971a Author: Sam James gentoo org> AuthorDate: Tue Dec 28 05:57:10 2021 + Commit: Sam James gentoo org> CommitDate: Tue Dec 28 05:57:10 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ceb138 media-gfx/geeqie: Stabilize 1.6 x86, #829471 Signed-off-by: Sam James gentoo.org> media-gfx/geeqie/geeqie-1.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-1.6.ebuild b/media-gfx/geeqie/geeqie-1.6.ebuild index 7952fb0e1995..5784fd2b760f 100644 --- a/media-gfx/geeqie/geeqie-1.6.ebuild +++ b/media-gfx/geeqie/geeqie-1.6.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 0bda08cdc2e075250470078386c31cec92af6b69 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Dec 23 10:36:16 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Dec 23 10:36:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bda08cd media-gfx/geeqie: amd64 stable wrt bug #829471 Package-Manager: Portage-3.0.28, Repoman-3.0.3 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> media-gfx/geeqie/geeqie-1.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-1.6.ebuild b/media-gfx/geeqie/geeqie-1.6.ebuild index 1ba491ef5cd1..7952fb0e1995 100644 --- a/media-gfx/geeqie/geeqie-1.6.ebuild +++ b/media-gfx/geeqie/geeqie-1.6.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: cde5e4decd0da72c9a322bcc6348ec86f043d1b3 Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Dec 22 14:33:49 2021 + Commit: Bernard Cafarelli gentoo org> CommitDate: Wed Dec 22 14:33:58 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cde5e4de media-gfx/geeqie: fix SRC_URI Closes: https://bugs.gentoo.org/829808 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-1.6_p20211016.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-1.6_p20211016.ebuild b/media-gfx/geeqie/geeqie-1.6_p20211016.ebuild index fc3e8999ad42..116b8a480772 100644 --- a/media-gfx/geeqie/geeqie-1.6_p20211016.ebuild +++ b/media-gfx/geeqie/geeqie-1.6_p20211016.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="A lightweight GTK image viewer forked from GQview" HOMEPAGE="http://www.geeqie.org"; MY_PV="0edb0f1265b193ec08ffbde7a1a7871526d29d92" # Needs full git checkout to generate ChangeLog, this tarball has it -SRC_URI="https://dev.gentoo.org/~voyageur/${P}.tar.xz"; +SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 0dae326f61ea453ee8b794821acf488710eb587f Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Dec 22 12:23:24 2021 + Commit: Bernard Cafarelli gentoo org> CommitDate: Wed Dec 22 13:09:31 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dae326f media-gfx/geeqie: snapshot bump to have a proper gtk3 version Completely drop gtk2 (and gtk3 USE flag) Closes: https://bugs.gentoo.org/769101 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest| 1 + media-gfx/geeqie/geeqie-1.6_p20211016.ebuild | 97 2 files changed, 98 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 56e07a788c97..1daf3e8664f7 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,2 +1,3 @@ DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef +DIST geeqie-1.6_p20211016.tar.xz 36433388 BLAKE2B e8932398ce7354c08ad4199834870e2844555ee1a8ae2beebd9a512100784a5cb62e00993b3ef1854a7ab1bd37eb0742ebcfc17605429f99b61e1af2fbaf859e SHA512 9e536beac39028fdcbe04d014460de2b02039b2c027f9603a71554339b2d14116f8dff11bb09c6e73d51550188daf40031535f978fbbc2d355d30593f4f29e9d diff --git a/media-gfx/geeqie/geeqie-1.6_p20211016.ebuild b/media-gfx/geeqie/geeqie-1.6_p20211016.ebuild new file mode 100644 index ..fc3e8999ad42 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.6_p20211016.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +LUA_COMPAT=( lua5-{1..3} ) + +inherit autotools lua-single xdg + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +MY_PV="0edb0f1265b193ec08ffbde7a1a7871526d29d92" +# Needs full git checkout to generate ChangeLog, this tarball has it +SRC_URI="https://dev.gentoo.org/~voyageur/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp" + +RDEPEND=" + virtual/libintl + x11-libs/gtk+:3 + doc? ( app-text/gnome-doc-utils ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + gpu-accel? ( media-libs/clutter-gtk ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( ${LUA_DEPS} ) + map? ( media-libs/libchamplain:0.12 ) + pdf? ( >=app-text/poppler-0.62[cairo] ) + tiff? ( media-libs/tiff:0 ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + map? ( gpu-accel )" + +src_prepare() { + default + + # Remove -Werror (gcc changes may add new warnings) + sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die + + # Remove force rebuild of Lua API ref + sed -e 's#./create-doxygen-lua-api.sh##' -i doc/Makefile.am || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} + --enable-gtk3 + $(use_enable debug debug-log) + $(use_enable ffmpegthumbnailer) + $(use_enable gpu-accel) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable map) + $(use_enable nls) + $(use_enable pdf) + $(use_enable tiff) + ) + + if use exif || use xmp; then + myeconfargs+=( --enable-exiv2 ) + else + myeconfargs+=( --disable-exiv2) + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + rm -f "${D}/usr/share/doc/${PF}/COPYING" + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README.md +} + +pkg_postinst() { + xdg_pkg_postinst + + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/u
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 684a591dae642315069968bcba4e5326648817e8 Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Dec 21 19:20:30 2021 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Dec 21 20:11:11 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=684a591d media-gfx/geeqie: drop USE=gtk3 in live ebuild Bug: https://bugs.gentoo.org/769101 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-.ebuild | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index b9db7c038a20..e97db26b4d23 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..3} ) inherit autotools git-r3 lua-single xdg @@ -15,15 +15,14 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"; LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" +IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp" RDEPEND=" virtual/libintl + x11-libs/gtk+:3 doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) @@ -41,7 +40,6 @@ BDEPEND=" nls? ( sys-devel/gettext )" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - gpu-accel? ( gtk3 ) map? ( gpu-accel )" src_prepare() { @@ -56,10 +54,10 @@ src_prepare() { src_configure() { local myeconfargs=( --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} + --enable-gtk3 $(use_enable debug debug-log) $(use_enable ffmpegthumbnailer) $(use_enable gpu-accel) - $(use_enable gtk3) $(use_enable jpeg) $(use_enable lcms) $(use_enable lua)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
commit: b2432b263b4f698572288e0444b6b7ce8e918bfa Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Apr 27 21:24:42 2021 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Apr 27 21:29:54 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2432b26 media-gfx/geeqie: fix install with newer yelp Closes: https://bugs.gentoo.org/785142 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/files/geeqie-1.6-yelp.patch | 25 + media-gfx/geeqie/geeqie-1.6.ebuild | 4 +++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/media-gfx/geeqie/files/geeqie-1.6-yelp.patch b/media-gfx/geeqie/files/geeqie-1.6-yelp.patch new file mode 100644 index 000..e1d7797d1d5 --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-1.6-yelp.patch @@ -0,0 +1,25 @@ +From a33d8c40e9e56597f68e83be3336036992996738 Mon Sep 17 00:00:00 2001 +From: Matthew Miller +Date: Thu, 8 Apr 2021 20:21:39 -0400 +Subject: [PATCH] Fix doc building with newer yelp + +This adds `-i`, because otherwise it will complain about missing files (which +we copy into place later), and adds a trailing slash to the output directory, +because `yelp-build` now puts the files into the wrong place otherwise. +--- + doc/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 3d044bd8..78b96233 100644 +--- a/doc/Makefile.am b/doc/Makefile.am +@@ -7,7 +7,7 @@ EXTRA_DIST = docbook2html.sh docbook icons + html/GuideIndex.html: docbook/GuideIndex.xml + rm -rf html; mkdir html; cp $(srcdir)/icons/* html/ + if [ -x "$(GNOME_DOC_TOOL)" ]; then \ +- "$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \ ++ "$(GNOME_DOC_TOOL)" html -i -o html/ $(srcdir)/docbook/GuideIndex.xml ; \ + else \ + echo "yelp-tools not found, html is not built" ; \ + fi diff --git a/media-gfx/geeqie/geeqie-1.6.ebuild b/media-gfx/geeqie/geeqie-1.6.ebuild index 39216c02793..1ba491ef5cd 100644 --- a/media-gfx/geeqie/geeqie-1.6.ebuild +++ b/media-gfx/geeqie/geeqie-1.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -42,6 +42,8 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) gpu-accel? ( gtk3 ) map? ( gpu-accel )" +PATCHES=( "${FILESDIR}"/${P}-yelp.patch ) + src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 47814eb1e2c745cdbf2c1ebedf95a96caf03d0f9 Author: Conrad Kostecki gentoo org> AuthorDate: Fri Mar 26 18:52:26 2021 + Commit: Conrad Kostecki gentoo org> CommitDate: Fri Mar 26 19:45:17 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47814eb1 media-gfx/geeqie: drop old version Dropping old version, which does not support slotted lua. Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Conrad Kostecki gentoo.org> media-gfx/geeqie/geeqie-1.5.1.ebuild | 94 1 file changed, 94 deletions(-) diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild deleted file mode 100644 index 4e7557f9002..000 --- a/media-gfx/geeqie/geeqie-1.5.1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools xdg - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org"; -SRC_URI="http://www.geeqie.org/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" - -RDEPEND=" - virtual/libintl - doc? ( app-text/gnome-doc-utils ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - gpu-accel? ( media-libs/clutter-gtk ) - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - lirc? ( app-misc/lirc ) - lua? ( >=dev-lang/lua-5.1:0= ) - map? ( media-libs/libchamplain:0.12 ) - pdf? ( >=app-text/poppler-0.62[cairo] ) - tiff? ( media-libs/tiff:0 ) - xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -REQUIRED_USE="gpu-accel? ( gtk3 ) - map? ( gpu-accel )" - -PATCHES=( "${FILESDIR}"/${P}-no_common.patch ) - -src_prepare() { - default - - # Remove -Werror (gcc changes may add new warnings) - sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable debug debug-log) - $(use_enable ffmpegthumbnailer) - $(use_enable gpu-accel) - $(use_enable gtk3) - $(use_enable jpeg) - $(use_enable lcms) - $(use_enable lua) - $(use_enable lirc) - $(use_enable map) - $(use_enable nls) - $(use_enable pdf) - $(use_enable tiff) - ) - - if use exif || use xmp; then - myeconfargs+=( --enable-exiv2 ) - else - myeconfargs+=( --disable-exiv2) - fi - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - rm -f "${D}/usr/share/doc/${PF}/COPYING" - # Application needs access to the uncompressed file - docompress -x /usr/share/doc/${PF}/README.md -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "Some plugins may require additional packages" - elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" - elog "- RAW images plugin: media-gfx/ufraw" -}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 8264ca98c4718c8f9fd4e2870f92c80d505ecb12 Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Dec 4 16:13:23 2020 + Commit: Bernard Cafarelli gentoo org> CommitDate: Fri Dec 4 16:13:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8264ca98 media-gfx/geeqie: 1.6 bump Use gtk3 by default as per upstream Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest | 1 + media-gfx/geeqie/geeqie-1.6.ebuild | 94 ++ 2 files changed, 95 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index da65766b857..56e07a788c9 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1 +1,2 @@ DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac +DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef diff --git a/media-gfx/geeqie/geeqie-1.6.ebuild b/media-gfx/geeqie/geeqie-1.6.ebuild new file mode 100644 index 000..39216c02793 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.6.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +LUA_COMPAT=( lua5-{1..3} ) + +inherit autotools lua-single xdg + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="http://www.geeqie.org/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" + +RDEPEND=" + virtual/libintl + doc? ( app-text/gnome-doc-utils ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + gpu-accel? ( media-libs/clutter-gtk ) + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( ${LUA_DEPS} ) + map? ( media-libs/libchamplain:0.12 ) + pdf? ( >=app-text/poppler-0.62[cairo] ) + tiff? ( media-libs/tiff:0 ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + gpu-accel? ( gtk3 ) + map? ( gpu-accel )" + +src_prepare() { + default + + # Remove -Werror (gcc changes may add new warnings) + sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} + $(use_enable debug debug-log) + $(use_enable ffmpegthumbnailer) + $(use_enable gpu-accel) + $(use_enable gtk3) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable map) + $(use_enable nls) + $(use_enable pdf) + $(use_enable tiff) + ) + + if use exif || use xmp; then + myeconfargs+=( --enable-exiv2 ) + else + myeconfargs+=( --disable-exiv2) + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + rm -f "${D}/usr/share/doc/${PF}/COPYING" + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README.md +} + +pkg_postinst() { + xdg_pkg_postinst + + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/ufraw" +}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 1716b45dc13a94269dee3fc2f007d88212cc8329 Author: Marek Szuba gentoo org> AuthorDate: Thu Dec 3 12:53:07 2020 + Commit: Marek Szuba gentoo org> CommitDate: Thu Dec 3 12:54:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1716b45d media-gfx/geeqie: limit unmigrated ebuilds to dev-lang/lua:0 Signed-off-by: Marek Szuba gentoo.org> media-gfx/geeqie/geeqie-1.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild index 63b12f277dc..4e7557f9002 100644 --- a/media-gfx/geeqie/geeqie-1.5.1.ebuild +++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild @@ -24,7 +24,7 @@ RDEPEND=" jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) - lua? ( >=dev-lang/lua-5.1:= ) + lua? ( >=dev-lang/lua-5.1:0= ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) tiff? ( media-libs/tiff:0 )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
commit: 0ad537e99690027d0f2c80609e968ff42b0e0778 Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Jan 24 14:02:59 2020 + Commit: Bernard Cafarelli gentoo org> CommitDate: Fri Jan 24 14:03:25 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad537e9 media-gfx/geeqie: fix build with -fno-common/gcc10, thanks slyfox Also sync stable and live ebuilds Closes: https://bugs.gentoo.org/706132 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli gentoo.org> .../geeqie/files/geeqie-1.5.1-no_common.patch | 75 ++ media-gfx/geeqie/geeqie-1.5.1.ebuild | 22 --- media-gfx/geeqie/geeqie-.ebuild| 9 ++- 3 files changed, 94 insertions(+), 12 deletions(-) diff --git a/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch b/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch new file mode 100644 index 000..058e2268625 --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch @@ -0,0 +1,75 @@ +From 543ea6d903a50c353d9e129d380240f277a670aa Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Thu, 23 Jan 2020 08:24:52 + +Subject: [PATCH] src/options: fix build failure against gcc-10 + +On gcc-10 (and gcc-9 -fno-common) build fails as: + +``` + CXXLDgeeqie +ld: ui_fileops.o:(.bss+0x0): + multiple definition of `options'; ui_bookmark.o:(.bss+0x0): first defined here +ld: ui_fileops.o:(.bss+0x8): + multiple definition of `command_line'; ui_bookmark.o:(.bss+0x8): first defined here +``` + +gcc-10 will change the default from -fcommon to fno-common: +https://gcc.gnu.org/PR85678. + +The error also happens if CFLAGS=-fno-common passed explicitly. + +Reported-by: Anthony Parsons +Bug: https://bugs.gentoo.org/706132 +Signed-off-by: Sergei Trofimovich +--- + src/bar_exif.h | 3 --- + src/options.c | 3 +++ + src/options.h | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/bar_exif.h b/src/bar_exif.h +index 63c30d4b..1395e842 100644 +--- a/src/bar_exif.h b/src/bar_exif.h +@@ -28,9 +28,6 @@ void bar_pane_exif_update_from_config(GtkWidget *pane, const gchar **attribute_n + void bar_pane_exif_entry_add_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values); + + /* these are exposed for when duplication of the exif bar's text is needed */ +- +-const gchar **bar_exif_key_list; +-const gint bar_exif_key_count; + GList *bar_pane_exif_list(); + + #endif +diff --git a/src/options.c b/src/options.c +index 99459381..bab26acb 100644 +--- a/src/options.c b/src/options.c +@@ -32,6 +32,9 @@ + #include "ui_fileops.h" + #include "window.h" + ++ConfOptions *options; ++CommandLine *command_line; ++ + ConfOptions *init_options(ConfOptions *options) + { + gint i; +diff --git a/src/options.h b/src/options.h +index fcfe961a..02ff8fac 100644 +--- a/src/options.h b/src/options.h +@@ -329,8 +329,8 @@ struct _ConfOptions + GList *disabled_plugins; + }; + +-ConfOptions *options; +-CommandLine *command_line; ++extern ConfOptions *options; ++extern CommandLine *command_line; + + ConfOptions *init_options(ConfOptions *options); + void setup_default_options(ConfOptions *options); +-- +2.25.0 + diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild index 88c65fbe11e..85d8651bf87 100644 --- a/media-gfx/geeqie/geeqie-1.5.1.ebuild +++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,9 +30,9 @@ RDEPEND=" tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" -DEPEND="${RDEPEND} - dev-util/glib-utils" +DEPEND="${RDEPEND}" BDEPEND=" + dev-util/glib-utils dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )" @@ -40,6 +40,8 @@ BDEPEND=" REQUIRED_USE="gpu-accel? ( gtk3 ) map? ( gpu-accel )" +PATCHES=( "${FILESDIR}"/${P}-no_common.patch ) + src_prepare() { default @@ -50,7 +52,8 @@ src_prepare() { } src_configure() { - local myconf="--disable-dependency-tracking + local myeconfargs=( + --disable-dependency-tracking --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} $(use_enable debug debug-log) $(use_enable ffmpegthumbnailer) @@ -63,19 +66,20 @@ src_configure() { $(use_enable map) $(use_enable nls) $(use_enable pdf) - $(use_enable tiff)" + $(use_enable tiff) + ) if use exif || use xmp; then - myconf="${myconf} --enable-exiv2" + myeconfargs+=( --enable-exiv2 ) else - myconf="${myconf} --disable-exiv2" + myeconfargs+=(
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 3641790da2a511c7150bb546e6ac170aa4190c4d Author: Bernard Cafarelli gentoo org> AuthorDate: Thu Jan 23 18:12:17 2020 + Commit: Bernard Cafarelli gentoo org> CommitDate: Thu Jan 23 18:12:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3641790d media-gfx/geeqie: fix live ebuild configure.in was moved to configure.ac Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index 3f25e162490..f40ac89c824 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,7 +45,7 @@ src_prepare() { default # Remove -Werror (gcc changes may add new warnings) - sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die + sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die eautoreconf }
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 3ad2321b8666e29fd4f6ff00cc1118dc7e23485a Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Dec 10 21:27:09 2019 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Dec 10 21:34:55 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ad2321b media-gfx/geeqie: use xdg eclass Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-1.5.1.ebuild | 8 ++-- media-gfx/geeqie/geeqie-.ebuild | 8 ++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild index 2d57b0dbebf..88c65fbe11e 100644 --- a/media-gfx/geeqie/geeqie-1.5.1.ebuild +++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools xdg-utils +inherit autotools xdg DESCRIPTION="A lightweight GTK image viewer forked from GQview" HOMEPAGE="http://www.geeqie.org"; @@ -83,13 +83,9 @@ src_install() { } pkg_postinst() { - xdg_desktop_database_update + xdg_pkg_postinst elog "Some plugins may require additional packages" elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" elog "- RAW images plugin: media-gfx/ufraw" } - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index e7ca05a8bf0..3f25e162490 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools git-r3 xdg-utils +inherit autotools git-r3 xdg DESCRIPTION="A lightweight GTK image viewer forked from GQview" HOMEPAGE="http://www.geeqie.org"; @@ -84,13 +84,9 @@ src_install() { } pkg_postinst() { - xdg_desktop_database_update + xdg_pkg_postinst elog "Some plugins may require additional packages" elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" elog "- RAW images plugin: media-gfx/ufraw" } - -pkg_postrm() { - xdg_desktop_database_update -}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/
commit: bbb11689ce25f0c290c50905a0b5c40f82838bef Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Dec 10 21:23:49 2019 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Dec 10 21:34:54 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbb11689 media-gfx/geeqie: drop old Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest | 2 - media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch | 80 -- media-gfx/geeqie/geeqie-1.4-r1.ebuild | 97 -- media-gfx/geeqie/geeqie-1.5.ebuild | 95 - 4 files changed, 274 deletions(-) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 95c4f2f3591..da65766b857 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,3 +1 @@ -DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205 DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac -DIST geeqie-1.5.tar.xz 1585780 BLAKE2B 6dc0a30c26f25988cbd3fa81a916642504e9f6f280b03d78c820cbf5b453d8a392d3c8da8d482de24b3c39e7e9ba0663879d651c60a8061b8034d2c526007944 SHA512 2b87d543d8d77a4fec331fd1b73ca2038912362fc1f94c9b0f163dcc7c2dd58118e175c5540aecafb0581708ea5c2a5a321dde09f644e2322bd4ca5c0284b722 diff --git a/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch b/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch deleted file mode 100644 index b9a3bde0db2..000 --- a/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 13859e2ec3a1afc74f109cfffdf0de39030cde86 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen -Date: Wed, 2 Jan 2019 01:04:45 +0100 -Subject: [PATCH] fix build against exiv2-0.27.x - -fixes #654 - src/exiv2.cc | 16 +--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/exiv2.cc b/src/exiv2.cc -index b3c80657..f40b725e 100644 a/src/exiv2.cc -+++ b/src/exiv2.cc -@@ -22,17 +22,27 @@ - - #ifdef HAVE_EXIV2 - -+// Don't include the file directly -+// Early Exiv2 versions didn't have version.hpp and the macros. -+#include - #include - #include - #include - #include - - // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer. -+#ifdef EXIV2_VERSION - #ifndef EXIV2_TEST_VERSION --# define EXIV2_TEST_VERSION(major,minor,patch) \ -+#define EXIV2_TEST_VERSION(major,minor,patch) \ - ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) - #endif -+#else -+#define EXIV2_TEST_VERSION(major,minor,patch) (false) -+#endif - -+#if EXIV2_TEST_VERSION(0,27,0) -+#define HAVE_EXIV2_ERROR_CODE -+#endif - - #include - #include -@@ -40,6 +50,10 @@ - #include - #include - -+#if EXIV2_TEST_VERSION(0,27,0) -+#define EXV_PACKAGE "exiv2" -+#endif -+ - #if !EXIV2_TEST_VERSION(0,17,90) - #include - #include -@@ -374,7 +388,11 @@ - #endif - Exiv2::Image *image = imageData_->image(); - -- if (!image) Exiv2::Error(21); -+#ifdef HAVE_EXIV2_ERROR_CODE -+ if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed); -+#else -+ if (!image) throw Exiv2::Error(21); -+#endif - image->setExifData(exifData_); - image->setIptcData(iptcData_); - #if EXIV2_TEST_VERSION(0,16,0) -@@ -394,8 +412,12 @@ - sidecar->setXmpData(xmpData_); - sidecar->writeMetadata(); - #else -+#ifdef HAVE_EXIV2_ERROR_CODE -+ throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp"); -+#else - throw Exiv2::Error(3, "xmp"); - #endif -+#endif - } - } - diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild deleted file mode 100644 index 5cf44c8bfe1..000 --- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools xdg-utils - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org"; -SRC_URI="http://www.geeqie.org/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" - -RDEPEND=" - virtual/libintl - doc? ( app-text/gnom
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 18ff116675b27b7e99d42a95a61cf6a57822cdef Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Nov 20 13:23:34 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Nov 20 13:23:34 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ff1166 media-gfx/geeqie: x86 stable wrt bug #700638 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> media-gfx/geeqie/geeqie-1.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild index 2834bb53f81..2d57b0dbebf 100644 --- a/media-gfx/geeqie/geeqie-1.5.1.ebuild +++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 0d61f2a2d3d930fbdcd62f676879f6d7cc23cc6e Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Nov 20 11:16:12 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Nov 20 11:16:12 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d61f2a2 media-gfx/geeqie: amd64 stable wrt bug #700638 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> media-gfx/geeqie/geeqie-1.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild index 5323596a4a9..2834bb53f81 100644 --- a/media-gfx/geeqie/geeqie-1.5.1.ebuild +++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 17e03fa4cc1a4820c69ece59760f2df37c805a16 Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Aug 23 11:57:35 2019 + Commit: Bernard Cafarelli gentoo org> CommitDate: Fri Aug 23 13:43:34 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e03fa4 media-gfx/geeqie: 1.5.1 bump Bugfix release on recent 1.5 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest| 1 + media-gfx/geeqie/geeqie-1.5.1.ebuild | 95 2 files changed, 96 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 9d22d0eaa1c..95c4f2f3591 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,2 +1,3 @@ DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205 +DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac DIST geeqie-1.5.tar.xz 1585780 BLAKE2B 6dc0a30c26f25988cbd3fa81a916642504e9f6f280b03d78c820cbf5b453d8a392d3c8da8d482de24b3c39e7e9ba0663879d651c60a8061b8034d2c526007944 SHA512 2b87d543d8d77a4fec331fd1b73ca2038912362fc1f94c9b0f163dcc7c2dd58118e175c5540aecafb0581708ea5c2a5a321dde09f644e2322bd4ca5c0284b722 diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild new file mode 100644 index 000..5323596a4a9 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools xdg-utils + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="http://www.geeqie.org/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" + +RDEPEND=" + virtual/libintl + doc? ( app-text/gnome-doc-utils ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + gpu-accel? ( media-libs/clutter-gtk ) + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( >=dev-lang/lua-5.1:= ) + map? ( media-libs/libchamplain:0.12 ) + pdf? ( >=app-text/poppler-0.62[cairo] ) + tiff? ( media-libs/tiff:0 ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" +DEPEND="${RDEPEND} + dev-util/glib-utils" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +REQUIRED_USE="gpu-accel? ( gtk3 ) + map? ( gpu-accel )" + +src_prepare() { + default + + # Remove -Werror (gcc changes may add new warnings) + sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die + + eautoreconf +} + +src_configure() { + local myconf="--disable-dependency-tracking + --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} + $(use_enable debug debug-log) + $(use_enable ffmpegthumbnailer) + $(use_enable gpu-accel) + $(use_enable gtk3) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable map) + $(use_enable nls) + $(use_enable pdf) + $(use_enable tiff)" + + if use exif || use xmp; then + myconf="${myconf} --enable-exiv2" + else + myconf="${myconf} --disable-exiv2" + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + rm -f "${D}/usr/share/doc/${PF}/COPYING" + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README.md +} + +pkg_postinst() { + xdg_desktop_database_update + + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/ufraw" +} + +pkg_postrm() { + xdg_desktop_database_update +}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 9dadab9b25973b41b03184474315fcf6986a7a88 Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Jul 30 20:23:38 2019 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Jul 30 20:47:02 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dadab9b media-gfx/geeqie: 1.5 bump Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/Manifest | 1 + media-gfx/geeqie/geeqie-1.5.ebuild | 95 ++ 2 files changed, 96 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 95acd2ee962..9d22d0eaa1c 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1 +1,2 @@ DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205 +DIST geeqie-1.5.tar.xz 1585780 BLAKE2B 6dc0a30c26f25988cbd3fa81a916642504e9f6f280b03d78c820cbf5b453d8a392d3c8da8d482de24b3c39e7e9ba0663879d651c60a8061b8034d2c526007944 SHA512 2b87d543d8d77a4fec331fd1b73ca2038912362fc1f94c9b0f163dcc7c2dd58118e175c5540aecafb0581708ea5c2a5a321dde09f644e2322bd4ca5c0284b722 diff --git a/media-gfx/geeqie/geeqie-1.5.ebuild b/media-gfx/geeqie/geeqie-1.5.ebuild new file mode 100644 index 000..5323596a4a9 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.5.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools xdg-utils + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="http://www.geeqie.org/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" + +RDEPEND=" + virtual/libintl + doc? ( app-text/gnome-doc-utils ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + gpu-accel? ( media-libs/clutter-gtk ) + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( >=dev-lang/lua-5.1:= ) + map? ( media-libs/libchamplain:0.12 ) + pdf? ( >=app-text/poppler-0.62[cairo] ) + tiff? ( media-libs/tiff:0 ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" +DEPEND="${RDEPEND} + dev-util/glib-utils" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +REQUIRED_USE="gpu-accel? ( gtk3 ) + map? ( gpu-accel )" + +src_prepare() { + default + + # Remove -Werror (gcc changes may add new warnings) + sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die + + eautoreconf +} + +src_configure() { + local myconf="--disable-dependency-tracking + --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} + $(use_enable debug debug-log) + $(use_enable ffmpegthumbnailer) + $(use_enable gpu-accel) + $(use_enable gtk3) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable map) + $(use_enable nls) + $(use_enable pdf) + $(use_enable tiff)" + + if use exif || use xmp; then + myconf="${myconf} --enable-exiv2" + else + myconf="${myconf} --disable-exiv2" + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + rm -f "${D}/usr/share/doc/${PF}/COPYING" + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README.md +} + +pkg_postinst() { + xdg_desktop_database_update + + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/ufraw" +} + +pkg_postrm() { + xdg_desktop_database_update +}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 330f20a64d3e6bda6b99e314c4d13356d71d3cdd Author: Pacho Ramos gentoo org> AuthorDate: Thu Apr 25 22:12:46 2019 + Commit: Pacho Ramos gentoo org> CommitDate: Thu Apr 25 22:32:18 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=330f20a6 media-gfx/geeqie: Rename to configure.ac Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Pacho Ramos gentoo.org> media-gfx/geeqie/geeqie-1.4-r1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild index d98bed39302..5cf44c8bfe1 100644 --- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild +++ b/media-gfx/geeqie/geeqie-1.4-r1.ebuild @@ -49,6 +49,7 @@ src_prepare() { # Remove -Werror (gcc changes may add new warnings) sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die + mv configure.{in,ac} || die eautoreconf }
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
commit: e7c05267514f7ce91416cdcfd96a089f38381474 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 17 13:20:05 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 17 13:22:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c05267 media-gfx/geeqie: Drop 1.3 Broken by exiv2. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/geeqie/Manifest | 1 - media-gfx/geeqie/files/geeqie-1.3-stdstring.patch | 63 - media-gfx/geeqie/geeqie-1.3-r1.ebuild | 82 --- 3 files changed, 146 deletions(-) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 67f91905245..95acd2ee962 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,2 +1 @@ -DIST geeqie-1.3.tar.xz 1141820 BLAKE2B 7a8639a136797c85d1bf96567ed0cae74c5cd0dacb8fac4832ffcb31ead372ac100948f9b65332d749500327c6ec3e7cb195da15980eaf0771ca6b55879dd8e4 SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718 DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205 diff --git a/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch b/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch deleted file mode 100644 index fb58db6a528..000 --- a/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 0b044d1d685307e5755917e31d56a1a3104cd505 Mon Sep 17 00:00:00 2001 -From: David Kalnischkies -Date: Fri, 27 May 2016 12:04:40 +0100 -Subject: [PATCH] Work around changed c++11 std::string implementation - -Bug was already partly fixed by 96db62d but there was even more -positions that was unseen by Solomon. - -The patch is originally from Debian bug report #800350. - -Signed-off-by: Klaus Ethgen - src/exiv2.cc | 12 +++- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/src/exiv2.cc b/src/exiv2.cc -index 1dbe118..49b8e07 100644 a/src/exiv2.cc -+++ b/src/exiv2.cc -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer. - #ifndef EXIV2_TEST_VERSION -@@ -1140,8 +1141,9 @@ guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width, - - if (!exif->image()) return NULL; - -+ std::string const path = exif->image()->io().path(); - /* given image pathname, first do simple (and fast) file extension test */ -- gboolean is_raw = filter_file_class(exif->image()->io().path().c_str(), FORMAT_CLASS_RAWIMAGE); -+ gboolean is_raw = filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE); - - if (!is_raw && requested_width == 0) return NULL; - -@@ -1241,10 +1243,10 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques - if (!exif) return NULL; - if (!exif->image()) return NULL; - -- const char* path = exif->image()->io().path().c_str(); -+ std::string const path = exif->image()->io().path(); - - /* given image pathname, first do simple (and fast) file extension test */ -- if (!filter_file_class(path, FORMAT_CLASS_RAWIMAGE)) return NULL; -+ if (!filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE)) return NULL; - - try { - struct stat st; -@@ -1255,9 +1257,9 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques - - RawFile rf(exif->image()->io()); - offset = rf.preview_offset(); -- DEBUG_1("%s: offset %lu", path, offset); -+ DEBUG_1("%s: offset %lu", path.c_str(), offset); - -- fd = open(path, O_RDONLY); -+ fd = open(path.c_str(), O_RDONLY); - if (fd == -1) - { - return NULL; diff --git a/media-gfx/geeqie/geeqie-1.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.3-r1.ebuild deleted file mode 100644 index dd9b8e0511a..000 --- a/media-gfx/geeqie/geeqie-1.3-r1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org"; -SRC_URI="http://www.geeqie.org/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="debug doc exif gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" - -RDEPEND="gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) - virtual/libintl - doc? ( app-text/gnome-doc-utils ) - gpu-accel? ( media-libs/c
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: ac4a710a655a100aa050168519d329e21956377e Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 9 21:27:26 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 10 21:54:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4a710a media-gfx/geeqie: Use BDEPEND w/ EAPI-7 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/geeqie/geeqie-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index 3f9641ee79f..d20c4c1fa62 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -31,7 +31,8 @@ RDEPEND=" tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/intltool sys-devel/gettext virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
commit: b9c04877a81a1355e6ef3b75129374734f4ed842 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 9 21:22:04 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 10 21:54:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c04877 media-gfx/geeqie: Fix build with exiv2-0.27 Patch is already upstream, see also: https://github.com/BestImageViewer/geeqie/issues/654 Closes: https://bugs.gentoo.org/674044 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch | 80 ++ media-gfx/geeqie/geeqie-1.4-r1.ebuild | 4 +- 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch b/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch new file mode 100644 index 000..b9a3bde0db2 --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch @@ -0,0 +1,80 @@ +From 13859e2ec3a1afc74f109cfffdf0de39030cde86 Mon Sep 17 00:00:00 2001 +From: Rasmus Thomsen +Date: Wed, 2 Jan 2019 01:04:45 +0100 +Subject: [PATCH] fix build against exiv2-0.27.x + +fixes #654 +--- + src/exiv2.cc | 16 +--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/src/exiv2.cc b/src/exiv2.cc +index b3c80657..f40b725e 100644 +--- a/src/exiv2.cc b/src/exiv2.cc +@@ -22,17 +22,27 @@ + + #ifdef HAVE_EXIV2 + ++// Don't include the file directly ++// Early Exiv2 versions didn't have version.hpp and the macros. ++#include + #include + #include + #include + #include + + // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer. ++#ifdef EXIV2_VERSION + #ifndef EXIV2_TEST_VERSION +-# define EXIV2_TEST_VERSION(major,minor,patch) \ ++#define EXIV2_TEST_VERSION(major,minor,patch) \ + ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) + #endif ++#else ++#define EXIV2_TEST_VERSION(major,minor,patch) (false) ++#endif + ++#if EXIV2_TEST_VERSION(0,27,0) ++#define HAVE_EXIV2_ERROR_CODE ++#endif + + #include + #include +@@ -40,6 +50,10 @@ + #include + #include + ++#if EXIV2_TEST_VERSION(0,27,0) ++#define EXV_PACKAGE "exiv2" ++#endif ++ + #if !EXIV2_TEST_VERSION(0,17,90) + #include + #include +@@ -374,7 +388,11 @@ + #endif + Exiv2::Image *image = imageData_->image(); + +- if (!image) Exiv2::Error(21); ++#ifdef HAVE_EXIV2_ERROR_CODE ++ if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed); ++#else ++ if (!image) throw Exiv2::Error(21); ++#endif + image->setExifData(exifData_); + image->setIptcData(iptcData_); + #if EXIV2_TEST_VERSION(0,16,0) +@@ -394,8 +412,12 @@ + sidecar->setXmpData(xmpData_); + sidecar->writeMetadata(); + #else ++#ifdef HAVE_EXIV2_ERROR_CODE ++ throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp"); ++#else + throw Exiv2::Error(3, "xmp"); + #endif ++#endif + } + } + diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild index 3080dded12b..a503145669b 100644 --- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild +++ b/media-gfx/geeqie/geeqie-1.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -35,6 +35,8 @@ DEPEND="${RDEPEND} REQUIRED_USE="gpu-accel? ( gtk3 ) map? ( gpu-accel )" +PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674044 + src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: b98102cb40851f104b467908016987bbcd9820da Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 9 21:25:27 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 10 21:54:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b98102cb media-gfx/geeqie: Sort DEPENDs Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/geeqie/geeqie-1.4-r1.ebuild | 14 -- media-gfx/geeqie/geeqie-.ebuild | 16 +--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild index a503145669b..604a8c6a1fc 100644 --- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild +++ b/media-gfx/geeqie/geeqie-1.4-r1.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit autotools xdg-utils DESCRIPTION="A lightweight GTK image viewer forked from GQview" @@ -13,24 +14,25 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" -RDEPEND="gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) +RDEPEND=" virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) + tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) - tiff? ( media-libs/tiff:0 )" + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" DEPEND="${RDEPEND} - virtual/pkgconfig dev-util/intltool - sys-devel/gettext" + sys-devel/gettext + virtual/pkgconfig" REQUIRED_USE="gpu-accel? ( gtk3 ) map? ( gpu-accel )" diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index a4b9efab87e..3f9641ee79f 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools git-r3 xdg-utils DESCRIPTION="A lightweight GTK image viewer forked from GQview" @@ -15,24 +16,25 @@ SLOT="0" KEYWORDS="" IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" -RDEPEND="gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) +RDEPEND=" virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) + tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) - tiff? ( media-libs/tiff:0 )" + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" DEPEND="${RDEPEND} - virtual/pkgconfig dev-util/intltool - sys-devel/gettext" + sys-devel/gettext + virtual/pkgconfig" REQUIRED_USE="gpu-accel? ( gtk3 ) map? ( gpu-accel )"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: b117a4fe14a003e7a1c58efa923b12fedc72d11c Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 9 21:29:43 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 10 21:54:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b117a4fe media-gfx/geeqie: myeconfargs array Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/geeqie/geeqie-.ebuild | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index d20c4c1fa62..4f2b34adbac 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -50,7 +50,8 @@ src_prepare() { } src_configure() { - local myconf="--disable-dependency-tracking + local myeconfargs=( + --disable-dependency-tracking --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} $(use_enable debug debug-log) $(use_enable ffmpegthumbnailer) @@ -61,15 +62,16 @@ src_configure() { $(use_enable lua) $(use_enable lirc) $(use_enable map) - $(use_enable tiff)" + $(use_enable tiff) + ) if use exif || use xmp; then - myconf="${myconf} --enable-exiv2" + myeconfargs+=( --enable-exiv2 ) else - myconf="${myconf} --disable-exiv2" + myeconfargs+=( --disable-exiv2) fi - econf ${myconf} + econf "${myeconfargs[@]}" } src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 5c0c731a9e15015eec9bf7f8b3a59ef20ef3ceb4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 9 21:40:10 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 10 21:54:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c0c731a media-gfx/geeqie: Add missing dev-util/glib-utils (B)DEPEND Closes: https://bugs.gentoo.org/667570 Closes: https://bugs.gentoo.org/667568 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/geeqie/geeqie-1.4-r1.ebuild | 1 + media-gfx/geeqie/geeqie-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild index 604a8c6a1fc..d98bed39302 100644 --- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild +++ b/media-gfx/geeqie/geeqie-1.4-r1.ebuild @@ -30,6 +30,7 @@ RDEPEND=" xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" DEPEND="${RDEPEND} + dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig" diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index 4f2b34adbac..d2908d42d9c 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -33,6 +33,7 @@ RDEPEND=" !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" DEPEND="${RDEPEND}" BDEPEND=" + dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: b8040111eb215de57389ed0e9d1ff468892b3d0d Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 10 21:48:22 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 10 21:54:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8040111 media-gfx/geeqie: gtk3 is default in master branch Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/geeqie/geeqie-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild index d2908d42d9c..e7ca05a8bf0 100644 --- a/media-gfx/geeqie/geeqie-.ebuild +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"; LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" +IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map tiff xmp" RDEPEND=" virtual/libintl
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 0cdab62709c862dc0582f4662a6ae3739dc8942e Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Dec 28 21:40:52 2018 + Commit: Bernard Cafarelli gentoo org> CommitDate: Fri Dec 28 21:41:07 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cdab627 media-gfx/geeqie: add live ebuild Thanks grumpytetra teknik.io> for original PR Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/geeqie/geeqie-.ebuild | 90 + 1 file changed, 90 insertions(+) diff --git a/media-gfx/geeqie/geeqie-.ebuild b/media-gfx/geeqie/geeqie-.ebuild new file mode 100644 index 000..a4b9efab87e --- /dev/null +++ b/media-gfx/geeqie/geeqie-.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools git-r3 xdg-utils + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="" +# Using github mirror, as geeqie.org does not have a valid SSL certificate +EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" + +RDEPEND="gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + virtual/libintl + doc? ( app-text/gnome-doc-utils ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + gpu-accel? ( media-libs/clutter-gtk ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( >=dev-lang/lua-5.1:= ) + map? ( media-libs/libchamplain:0.12 ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) + tiff? ( media-libs/tiff:0 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-util/intltool + sys-devel/gettext" + +REQUIRED_USE="gpu-accel? ( gtk3 ) + map? ( gpu-accel )" + +src_prepare() { + default + + # Remove -Werror (gcc changes may add new warnings) + sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die + + eautoreconf +} + +src_configure() { + local myconf="--disable-dependency-tracking + --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} + $(use_enable debug debug-log) + $(use_enable ffmpegthumbnailer) + $(use_enable gpu-accel) + $(use_enable gtk3) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable map) + $(use_enable tiff)" + + if use exif || use xmp; then + myconf="${myconf} --enable-exiv2" + else + myconf="${myconf} --disable-exiv2" + fi + + econf ${myconf} +} + +src_install() { + default + + rm -f "${D}/usr/share/doc/${PF}/COPYING" + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README.md +} + +pkg_postinst() { + xdg_desktop_database_update + + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/ufraw" +} + +pkg_postrm() { + xdg_desktop_database_update +}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 76d5a9978b81b7f4a0083b5ee2baa437c3747404 Author: Mikle Kolyada gentoo org> AuthorDate: Thu Oct 4 09:03:25 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Oct 4 09:03:25 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76d5a997 media-gfx/geeqie: amd64 stable wrt bug #666850 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 media-gfx/geeqie/geeqie-1.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild index e27344a61ad..3080dded12b 100644 --- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild +++ b/media-gfx/geeqie/geeqie-1.4-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc x86" +KEYWORDS="amd64 ~ppc x86" IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" RDEPEND="gtk3? ( x11-libs/gtk+:3 )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 5b4b2c9fba36f9ba8cde6581d845e49c87344a3b Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Oct 1 21:34:00 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Oct 1 21:45:21 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4b2c9f media-gfx/geeqie: x86 stable (bug #666850) Signed-off-by: Thomas Deutschmann gentoo.org> Package-Manager: Portage-2.3.50, Repoman-2.3.11 media-gfx/geeqie/geeqie-1.4-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild index 455f0a26353..e27344a61ad 100644 --- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild +++ b/media-gfx/geeqie/geeqie-1.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" RDEPEND="gtk3? ( x11-libs/gtk+:3 )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 74ae704636da0de9660b47e156856c1220da23c7 Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Jan 8 16:06:38 2018 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Jan 8 16:06:54 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74ae7046 media-gfx/geeqie: remove hardcoded -Werror Closes: https://bugs.gentoo.org/643142 Closes: https://bugs.gentoo.org/643146 Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-gfx/geeqie/geeqie-1.4-r1.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild index 067d078c68b..455f0a26353 100644 --- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild +++ b/media-gfx/geeqie/geeqie-1.4-r1.ebuild @@ -41,6 +41,9 @@ src_prepare() { # Missing from release tarball, and requires git tree to generate sed -e "/readme_DATA/s/ChangeLog\(.html\)\?//g" -i Makefile.am || die + # Remove -Werror (gcc changes may add new warnings) + sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die + eautoreconf }
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 8a094b587391a0b2f705b44c03998a5c2a026704 Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Jan 2 12:54:34 2018 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Jan 2 12:54:47 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a094b58 media-gfx/geeqie: add ffmpegthumbnailer USE-flag Thanks Tomasz Golinski alpha.uwb.edu.pl> in bug #642998 for mentioning this new feature Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-gfx/geeqie/{geeqie-1.4.ebuild => geeqie-1.4-r1.ebuild} | 4 +++- media-gfx/geeqie/metadata.xml| 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-1.4.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild similarity index 91% rename from media-gfx/geeqie/geeqie-1.4.ebuild rename to media-gfx/geeqie/geeqie-1.4-r1.ebuild index 7da47a52843..067d078c68b 100644 --- a/media-gfx/geeqie/geeqie-1.4.ebuild +++ b/media-gfx/geeqie/geeqie-1.4-r1.ebuild @@ -11,12 +11,13 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug doc exif gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" +IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" RDEPEND="gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) virtual/libintl doc? ( app-text/gnome-doc-utils ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) @@ -47,6 +48,7 @@ src_configure() { local myconf="--disable-dependency-tracking --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} $(use_enable debug debug-log) + $(use_enable ffmpegthumbnailer) $(use_enable gpu-accel) $(use_enable gtk3) $(use_enable jpeg) diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml index 4dc6d6e..653dda70b09 100644 --- a/media-gfx/geeqie/metadata.xml +++ b/media-gfx/geeqie/metadata.xml @@ -7,6 +7,7 @@ Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool + Enable video thumbnail support with media-video/ffmpegthumbnailer Enable GPU acceleration support - experimental Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2 Enable items map display - experimental
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: a5cef9acd12acb3a7b1307b53b1dfff6e4404f3d Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Jan 1 23:14:15 2018 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Jan 1 23:14:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5cef9ac media-gfx/geeqie: 1.4 version bump Closes: https://bugs.gentoo.org/642998 Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-gfx/geeqie/Manifest | 1 + media-gfx/geeqie/geeqie-1.4.ebuild | 86 ++ 2 files changed, 87 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 51c758b516d..67f91905245 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1 +1,2 @@ DIST geeqie-1.3.tar.xz 1141820 BLAKE2B 7a8639a136797c85d1bf96567ed0cae74c5cd0dacb8fac4832ffcb31ead372ac100948f9b65332d749500327c6ec3e7cb195da15980eaf0771ca6b55879dd8e4 SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718 +DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205 diff --git a/media-gfx/geeqie/geeqie-1.4.ebuild b/media-gfx/geeqie/geeqie-1.4.ebuild new file mode 100644 index 000..7da47a52843 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.4.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools xdg-utils + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="http://www.geeqie.org/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" + +RDEPEND="gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + virtual/libintl + doc? ( app-text/gnome-doc-utils ) + gpu-accel? ( media-libs/clutter-gtk ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( >=dev-lang/lua-5.1:= ) + map? ( media-libs/libchamplain:0.12 ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) + tiff? ( media-libs/tiff:0 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-util/intltool + sys-devel/gettext" + +REQUIRED_USE="gpu-accel? ( gtk3 ) + map? ( gpu-accel )" + +src_prepare() { + default + + # Missing from release tarball, and requires git tree to generate + sed -e "/readme_DATA/s/ChangeLog\(.html\)\?//g" -i Makefile.am || die + + eautoreconf +} + +src_configure() { + local myconf="--disable-dependency-tracking + --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} + $(use_enable debug debug-log) + $(use_enable gpu-accel) + $(use_enable gtk3) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable map) + $(use_enable tiff)" + + if use exif || use xmp; then + myconf="${myconf} --enable-exiv2" + else + myconf="${myconf} --disable-exiv2" + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + rm -f "${D}/usr/share/doc/${PF}/COPYING" + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README.md +} + +pkg_postinst() { + xdg_desktop_database_update + + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/ufraw" +} + +pkg_postrm() { + xdg_desktop_database_update +}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
commit: 742e0eafb7aa138d3bfab98088bf6df39dfdabdc Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Nov 27 14:03:01 2017 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Nov 27 14:03:01 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742e0eaf media-gfx/geeqie: drop old Package-Manager: Portage-2.3.16, Repoman-2.3.6 media-gfx/geeqie/Manifest | 4 +- .../files/geeqie-1.2.2-fix_keywords_gtk3.patch | 12 --- .../files/geeqie-1.2.3-fix_keywords_gtk3.patch | 88 -- media-gfx/geeqie/geeqie-1.2.2-r2.ebuild| 75 -- media-gfx/geeqie/geeqie-1.2.3-r1.ebuild| 77 --- media-gfx/geeqie/geeqie-1.3.ebuild | 82 6 files changed, 1 insertion(+), 337 deletions(-) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 9b4fe7af62e..51c758b516d 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,3 +1 @@ -DIST geeqie-1.2.2.tar.xz 1156616 SHA256 e1cbc403650730e2f4092159e4347c858d3d81e4374d2a51d635234ba90b3ee3 SHA512 0e134802b42061e76ec2f2d9069ab13ebcab17f889b04917e15aba74a208a4c4ffa5a957f45eb5bd14917d98d2d6250c1085cb065a1ae487050e5e2f325c14c4 WHIRLPOOL 78e960d2e551675b6474d30cfb0119177e14d1930a23b930c5b7ef7757092085db423713be495a4fcb51112c293eb88b12fe511b5b4bf64c86c27b8e410cb318 -DIST geeqie-1.2.3.tar.xz 1129804 SHA256 2629bf33a9070fad4804b1ef051c3bf8a8fdad3bba4e6188dc20588185003248 SHA512 1bb2a6e5782cdafb4aeb1ab9247f7d43f4ef341594ea795214c136ba1fe416cf8bc37faa43462780eca3d0b07a7852e27719f8d23c8bdb42c899857846b4f7b1 WHIRLPOOL 8b4ee7218bb1562695c5c5322e684652f9318f04ed77bc0a54e70dd46f63801a7f0cc9c9b37346a58f6c1059278c07f980dec439dd753f2f87ce7f2a98e01566 -DIST geeqie-1.3.tar.xz 1141820 SHA256 4b6f566dd1a8badac68c4353c7dd0f4de17f8627b85a7a70d5eb1ae3b540ec3f SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718 WHIRLPOOL 8b3e54ae6cf8f8a633225df4f5058c29a7dd56adc63c9594cb995929d4cebb3b07d76a257a454506330f32673ac9a57ce63eb3fbf33126ed4cbccc7542910720 +DIST geeqie-1.3.tar.xz 1141820 BLAKE2B 7a8639a136797c85d1bf96567ed0cae74c5cd0dacb8fac4832ffcb31ead372ac100948f9b65332d749500327c6ec3e7cb195da15980eaf0771ca6b55879dd8e4 SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718 diff --git a/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch b/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch deleted file mode 100644 index 99bc10d9b57..000 --- a/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch +++ /dev/null @@ -1,12 +0,0 @@ a/src/bar_keywords.c 2015-05-23 14:20:43.0 +0200 -+++ b/src/bar_keywords.c 2015-12-30 00:34:21.453531792 +0100 -@@ -1295,6 +1295,9 @@ - g_object_set_data(G_OBJECT(pkd->widget), "pane_data", pkd); - g_signal_connect(G_OBJECT(pkd->widget), "destroy", -G_CALLBACK(bar_pane_keywords_destroy), pkd); -+#if GTK_CHECK_VERSION(3,0,0) -+ gtk_widget_set_size_request(pkd->widget, -1, 400); -+#endif - gtk_widget_show(hbox); - - scrolled = gtk_scrolled_window_new(NULL, NULL); diff --git a/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch b/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch deleted file mode 100644 index 695effaffae..000 --- a/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch +++ /dev/null @@ -1,88 +0,0 @@ -From a174e816ae993e7ee9731651b2674dbfdec9ed95 Mon Sep 17 00:00:00 2001 -From: Colin Clark -Date: Wed, 30 Mar 2016 15:36:32 +0100 -Subject: [PATCH] Bug fix #227 + enable user to set height of Keywords pane - -Bug #227 Keywords section of Info sidebar doesn't work on GTK3 build -https://sourceforge.net/p/geeqie/bugs/227/ - -Permit the user to set the height of the Keywords pane in the Info -sidebar by editing the line: - - - -in the configuration file geeqierc.xml - src/bar_keywords.c | 10 -- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/bar_keywords.c b/src/bar_keywords.c -index f58f348..0eee90c 100644 a/src/bar_keywords.c -+++ b/src/bar_keywords.c -@@ -113,6 +113,7 @@ struct _PaneKeywordsData - guint idle_id; /* event source id */ - FileData *fd; - gchar *key; -+ gint height; - }; - - typedef struct _ConfDialogData ConfDialogData; -@@ -249,6 +250,7 @@ static void bar_pane_keywords_write_config(GtkWidget *pane, GString *outstr, gin - write_char_option(outstr, indent, "title", gtk_label_get_text(GTK_LABEL(pkd->pane.title))); - WRITE_BOOL(pkd->pane, expanded); - WRITE_CHAR(*pkd, key); -+ WRITE_INT(*pkd, height); - WRITE_STRING("/>"); - } - -@@ -1263,7 +1265,7 @@ static void bar_pane_keywords_destroy(GtkWidget *widget, gpointer data) - } - - --stati
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 437eebe9ecb5b37d4af01bdfe9e24e26a4a54ebc Author: Marek Szuba gentoo org> AuthorDate: Mon Nov 27 11:52:44 2017 + Commit: Marek Szuba gentoo org> CommitDate: Mon Nov 27 11:54:49 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=437eebe9 media-gfx/geeqie: 1.3-r1 stable on amd64 Gentoo-Bug: 626422 Package-Manager: Portage-2.3.13, Repoman-2.3.3 media-gfx/geeqie/geeqie-1.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-1.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.3-r1.ebuild index 285783cea80..dd9b8e0511a 100644 --- a/media-gfx/geeqie/geeqie-1.3-r1.ebuild +++ b/media-gfx/geeqie/geeqie-1.3-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc x86" +KEYWORDS="amd64 ~ppc x86" IUSE="debug doc exif gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" RDEPEND="gtk3? ( x11-libs/gtk+:3 )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 6cec682828884127a35a762d13f540c3f01c24f1 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Oct 9 23:19:09 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Oct 9 23:19:09 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cec6828 media-gfx/geeqie: x86 stable (bug #626422) Package-Manager: Portage-2.3.10, Repoman-2.3.3 media-gfx/geeqie/geeqie-1.3-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/geeqie/geeqie-1.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.3-r1.ebuild index a113ceba2fb..285783cea80 100644 --- a/media-gfx/geeqie/geeqie-1.3-r1.ebuild +++ b/media-gfx/geeqie/geeqie-1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" IUSE="debug doc exif gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" RDEPEND="gtk3? ( x11-libs/gtk+:3 )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: bad8167c10211b226c41adb2dd4be1e2e0c1d88b Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Nov 9 12:46:24 2016 + Commit: Bernard Cafarelli gentoo org> CommitDate: Wed Nov 9 12:47:32 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bad8167c media-gfx/geeqie: fix prefix install, bug #594712 Thanks Martin Mokrejš gmail.com> for the report and testing Package-Manager: portage-2.3.2 media-gfx/geeqie/geeqie-1.3-r1.ebuild | 83 +++ 1 file changed, 83 insertions(+) diff --git a/media-gfx/geeqie/geeqie-1.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.3-r1.ebuild new file mode 100644 index ..4a3f171 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.3-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit autotools + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="http://www.geeqie.org/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" + +RDEPEND="gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + virtual/libintl + doc? ( app-text/gnome-doc-utils ) + gpu-accel? ( media-libs/clutter-gtk ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( >=dev-lang/lua-5.1:= ) + map? ( media-libs/libchamplain:0.12 ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) + tiff? ( media-libs/tiff:0 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-util/intltool + sys-devel/gettext" + +REQUIRED_USE="gpu-accel? ( gtk3 ) + map? ( gpu-accel )" + +PATCHES=( + "${FILESDIR}"/${P}-stdstring.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + # clutter does not compile, gps depends on clutter + local myconf="--disable-dependency-tracking + --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} + $(use_enable debug debug-log) + $(use_enable gpu-accel) + $(use_enable gtk3) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable map) + $(use_enable tiff)" + + if use exif || use xmp; then + myconf="${myconf} --enable-exiv2" + else + myconf="${myconf} --disable-exiv2" + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + rm -f "${D}/usr/share/doc/${PF}/COPYING" + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README +} + +pkg_postinst() { + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/ufraw" +}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/
commit: 865cea8418f1e3a9fbaa37cee94f9c986bc07430 Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Jun 27 16:28:34 2016 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Jun 27 17:20:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865cea84 media-gfx/geeqie: 1.3 version bump Backport a patch to fix RAW image support with C++11 (reported by Dominic Eschweiler) Also add USE flags for experimental GPU acceleration and map support Package-Manager: portage-2.3.0 media-gfx/geeqie/Manifest | 1 + media-gfx/geeqie/files/geeqie-1.3-stdstring.patch | 63 + media-gfx/geeqie/geeqie-1.3.ebuild| 83 +++ media-gfx/geeqie/metadata.xml | 2 + 4 files changed, 149 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index cb93df5..9b4fe7a 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,2 +1,3 @@ DIST geeqie-1.2.2.tar.xz 1156616 SHA256 e1cbc403650730e2f4092159e4347c858d3d81e4374d2a51d635234ba90b3ee3 SHA512 0e134802b42061e76ec2f2d9069ab13ebcab17f889b04917e15aba74a208a4c4ffa5a957f45eb5bd14917d98d2d6250c1085cb065a1ae487050e5e2f325c14c4 WHIRLPOOL 78e960d2e551675b6474d30cfb0119177e14d1930a23b930c5b7ef7757092085db423713be495a4fcb51112c293eb88b12fe511b5b4bf64c86c27b8e410cb318 DIST geeqie-1.2.3.tar.xz 1129804 SHA256 2629bf33a9070fad4804b1ef051c3bf8a8fdad3bba4e6188dc20588185003248 SHA512 1bb2a6e5782cdafb4aeb1ab9247f7d43f4ef341594ea795214c136ba1fe416cf8bc37faa43462780eca3d0b07a7852e27719f8d23c8bdb42c899857846b4f7b1 WHIRLPOOL 8b4ee7218bb1562695c5c5322e684652f9318f04ed77bc0a54e70dd46f63801a7f0cc9c9b37346a58f6c1059278c07f980dec439dd753f2f87ce7f2a98e01566 +DIST geeqie-1.3.tar.xz 1141820 SHA256 4b6f566dd1a8badac68c4353c7dd0f4de17f8627b85a7a70d5eb1ae3b540ec3f SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718 WHIRLPOOL 8b3e54ae6cf8f8a633225df4f5058c29a7dd56adc63c9594cb995929d4cebb3b07d76a257a454506330f32673ac9a57ce63eb3fbf33126ed4cbccc7542910720 diff --git a/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch b/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch new file mode 100644 index 000..fb58db6 --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch @@ -0,0 +1,63 @@ +From 0b044d1d685307e5755917e31d56a1a3104cd505 Mon Sep 17 00:00:00 2001 +From: David Kalnischkies +Date: Fri, 27 May 2016 12:04:40 +0100 +Subject: [PATCH] Work around changed c++11 std::string implementation + +Bug was already partly fixed by 96db62d but there was even more +positions that was unseen by Solomon. + +The patch is originally from Debian bug report #800350. + +Signed-off-by: Klaus Ethgen +--- + src/exiv2.cc | 12 +++- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/src/exiv2.cc b/src/exiv2.cc +index 1dbe118..49b8e07 100644 +--- a/src/exiv2.cc b/src/exiv2.cc +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer. + #ifndef EXIV2_TEST_VERSION +@@ -1140,8 +1141,9 @@ guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width, + + if (!exif->image()) return NULL; + ++ std::string const path = exif->image()->io().path(); + /* given image pathname, first do simple (and fast) file extension test */ +- gboolean is_raw = filter_file_class(exif->image()->io().path().c_str(), FORMAT_CLASS_RAWIMAGE); ++ gboolean is_raw = filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE); + + if (!is_raw && requested_width == 0) return NULL; + +@@ -1241,10 +1243,10 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques + if (!exif) return NULL; + if (!exif->image()) return NULL; + +- const char* path = exif->image()->io().path().c_str(); ++ std::string const path = exif->image()->io().path(); + + /* given image pathname, first do simple (and fast) file extension test */ +- if (!filter_file_class(path, FORMAT_CLASS_RAWIMAGE)) return NULL; ++ if (!filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE)) return NULL; + + try { + struct stat st; +@@ -1255,9 +1257,9 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques + + RawFile rf(exif->image()->io()); + offset = rf.preview_offset(); +- DEBUG_1("%s: offset %lu", path, offset); ++ DEBUG_1("%s: offset %lu", path.c_str(), offset); + +- fd = open(path, O_RDONLY); ++ fd = open(path.c_str(), O_RDONLY); + if (fd == -1) + { + return NULL; diff --git a/media-gfx/geeqie/geeqie-1.3.ebuild b/media-gfx/geeqie/geeqie-1.3.ebuild new file mode 100644 index 000..f278e24 --- /dev/null +++ b/media-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/, media-gfx/geeqie/files/
commit: 1580a6fcf153bbf453221965d6340dfb19ad3db0 Author: Bernard Cafarelli gentoo org> AuthorDate: Thu Apr 21 12:35:03 2016 + Commit: Bernard Cafarelli gentoo org> CommitDate: Thu Apr 21 12:35:03 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1580a6fc media-gfx/geeqie: use upstream fix for gtk3 support Suggested by Tomasz Golinski in bug #579744 Package-Manager: portage-2.2.28 .../files/geeqie-1.2.3-fix_keywords_gtk3.patch | 88 ++ ...{geeqie-1.2.3.ebuild => geeqie-1.2.3-r1.ebuild} | 2 +- 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch b/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch new file mode 100644 index 000..695effa --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch @@ -0,0 +1,88 @@ +From a174e816ae993e7ee9731651b2674dbfdec9ed95 Mon Sep 17 00:00:00 2001 +From: Colin Clark +Date: Wed, 30 Mar 2016 15:36:32 +0100 +Subject: [PATCH] Bug fix #227 + enable user to set height of Keywords pane + +Bug #227 Keywords section of Info sidebar doesn't work on GTK3 build +https://sourceforge.net/p/geeqie/bugs/227/ + +Permit the user to set the height of the Keywords pane in the Info +sidebar by editing the line: + + + +in the configuration file geeqierc.xml +--- + src/bar_keywords.c | 10 -- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/bar_keywords.c b/src/bar_keywords.c +index f58f348..0eee90c 100644 +--- a/src/bar_keywords.c b/src/bar_keywords.c +@@ -113,6 +113,7 @@ struct _PaneKeywordsData + guint idle_id; /* event source id */ + FileData *fd; + gchar *key; ++ gint height; + }; + + typedef struct _ConfDialogData ConfDialogData; +@@ -249,6 +250,7 @@ static void bar_pane_keywords_write_config(GtkWidget *pane, GString *outstr, gin + write_char_option(outstr, indent, "title", gtk_label_get_text(GTK_LABEL(pkd->pane.title))); + WRITE_BOOL(pkd->pane, expanded); + WRITE_CHAR(*pkd, key); ++ WRITE_INT(*pkd, height); + WRITE_STRING("/>"); + } + +@@ -1263,7 +1265,7 @@ static void bar_pane_keywords_destroy(GtkWidget *widget, gpointer data) + } + + +-static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded) ++static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded, gint height) + { + PaneKeywordsData *pkd; + GtkWidget *hbox; +@@ -1285,6 +1287,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con + + pkd->pane.expanded = expanded; + ++ pkd->height = height; + pkd->key = g_strdup(key); + + pkd->expand_checked = TRUE; +@@ -1295,6 +1298,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con + g_object_set_data(G_OBJECT(pkd->widget), "pane_data", pkd); + g_signal_connect(G_OBJECT(pkd->widget), "destroy", +G_CALLBACK(bar_pane_keywords_destroy), pkd); ++ gtk_widget_set_size_request(pkd->widget, -1, height); + gtk_widget_show(hbox); + + scrolled = gtk_scrolled_window_new(NULL, NULL); +@@ -1417,6 +1421,7 @@ GtkWidget *bar_pane_keywords_new_from_config(const gchar **attribute_names, cons + gchar *title = NULL; + gchar *key = g_strdup(COMMENT_KEY); + gboolean expanded = TRUE; ++ gint height = 200; + GtkWidget *ret; + + while (*attribute_names) +@@ -1428,13 +1433,14 @@ GtkWidget *bar_pane_keywords_new_from_config(const gchar **attribute_names, cons + if (READ_CHAR_FULL("title", title)) continue; + if (READ_CHAR_FULL("key", key)) continue; + if (READ_BOOL_FULL("expanded", expanded)) continue; ++ if (READ_INT_FULL("height", height)) continue; + + + log_printf("unknown attribute %s = %s\n", option, value); + } + + bar_pane_translate_title(PANE_KEYWORDS, id, &title); +- ret = bar_pane_keywords_new(id, title, key, expanded); ++ ret = bar_pane_keywords_new(id, title, key, expanded, height); + g_free(id); + g_free(title); + g_free(key); diff --git a/media-gfx/geeqie/geeqie-1.2.3.ebuild b/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild similarity index 97% rename from media-gfx/geeqie/geeqie-1.2.3.ebuild rename to media-gfx/geeqie/geeqie-1.2.3-r1.ebuild index f5eb2d9..fd71ec3 100644 --- a/media-gfx/geeqie/geeqie-1.2.3.ebuild +++ b/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild @@ -31,7 +31,7 @@ DEPEND="${RDEPEND} sys-devel/gettext" PATCHES=( - "${FILESDIR}"/${PN}-1.2.2-fix_keywords_gtk3.patch + "${FILESDIR}"/${P}-fix_keywords_gtk3.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 475249781c796a2c09c69cdfdbea4cb8d7552390 Author: Michał Górny gentoo org> AuthorDate: Tue Apr 19 13:08:22 2016 + Commit: Michał Górny gentoo org> CommitDate: Tue Apr 19 13:12:01 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47524978 media-gfx/geeqie: Fix gtk+ pkg ref media-gfx/geeqie/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml index 47ad4e0..b188953 100644 --- a/media-gfx/geeqie/metadata.xml +++ b/media-gfx/geeqie/metadata.xml @@ -7,6 +7,6 @@ Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool - Link against x11-libs/gtk SLOT 3 instead of x11-libs/gtk SLOT 2 + Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: c3eb629975240a4f9f242cc6a2d68d3932621277 Author: Patrice Clement gentoo org> AuthorDate: Mon Apr 18 09:12:40 2016 + Commit: Patrice Clement gentoo org> CommitDate: Mon Apr 18 09:28:32 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3eb6299 media-gfx/geeqie: Fix metadata.xml file. Package-Manager: portage-2.2.26 media-gfx/geeqie/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml index 08b027d..47ad4e0 100644 --- a/media-gfx/geeqie/metadata.xml +++ b/media-gfx/geeqie/metadata.xml @@ -7,6 +7,6 @@ Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool - Link against x11-libs/gtk+:3 instead of x11-libs/gtk-2 + Link against x11-libs/gtk SLOT 3 instead of x11-libs/gtk SLOT 2
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: e785d8ea4f1c83a98532c0cd692dc439853bf954 Author: Patrice Clement gentoo org> AuthorDate: Mon Apr 18 06:54:27 2016 + Commit: Patrice Clement gentoo org> CommitDate: Mon Apr 18 07:58:43 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e785d8ea media-gfx/geeqie: Fix metadata.xml file. Package-Manager: portage-2.2.26 media-gfx/geeqie/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml index 20d518a..08b027d 100644 --- a/media-gfx/geeqie/metadata.xml +++ b/media-gfx/geeqie/metadata.xml @@ -7,6 +7,6 @@ Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool - Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2 + Link against x11-libs/gtk+:3 instead of x11-libs/gtk-2
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: b14daa42a8b8268f15a2b639db7e8f30a0d49f24 Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Apr 13 09:06:06 2016 + Commit: Bernard Cafarelli gentoo org> CommitDate: Wed Apr 13 09:13:36 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b14daa42 media-gfx/geeqie: version bump, bug #579744 Package-Manager: portage-2.2.28 media-gfx/geeqie/Manifest| 1 + media-gfx/geeqie/geeqie-1.2.3.ebuild | 78 2 files changed, 79 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 3dc218b..4c72771 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,3 +1,4 @@ DIST geeqie-1.2.1.tar.gz 1943377 SHA256 4611edfb25147d8cc98c0b64bef14a8fc7ab0996b662a1e19097eae21f6bf1d9 SHA512 d14069a333eb49f2bba1865d19facf2731b8d46fb95727c168cdb035bb8dcec55440f57170ed67e6d52349e92141066ea2293ca2040622970b30a3505a6902a4 WHIRLPOOL 85624263ebcaf8de54a4847110761cadc0b01a347b221ff9c303b63d556b8c62fd468d3426a98dabb01b035ebc442cab0075fa525660c9410662f12a95cbc1b7 DIST geeqie-1.2.2.tar.xz 1156616 SHA256 e1cbc403650730e2f4092159e4347c858d3d81e4374d2a51d635234ba90b3ee3 SHA512 0e134802b42061e76ec2f2d9069ab13ebcab17f889b04917e15aba74a208a4c4ffa5a957f45eb5bd14917d98d2d6250c1085cb065a1ae487050e5e2f325c14c4 WHIRLPOOL 78e960d2e551675b6474d30cfb0119177e14d1930a23b930c5b7ef7757092085db423713be495a4fcb51112c293eb88b12fe511b5b4bf64c86c27b8e410cb318 +DIST geeqie-1.2.3.tar.xz 1129804 SHA256 2629bf33a9070fad4804b1ef051c3bf8a8fdad3bba4e6188dc20588185003248 SHA512 1bb2a6e5782cdafb4aeb1ab9247f7d43f4ef341594ea795214c136ba1fe416cf8bc37faa43462780eca3d0b07a7852e27719f8d23c8bdb42c899857846b4f7b1 WHIRLPOOL 8b4ee7218bb1562695c5c5322e684652f9318f04ed77bc0a54e70dd46f63801a7f0cc9c9b37346a58f6c1059278c07f980dec439dd753f2f87ce7f2a98e01566 DIST geeqie-1.2.tar.gz 1904764 SHA256 f13fc2489fb9bed31ed48aec8b2a3a573c11cd6e036f1b07ed2cf6495ccc75dd SHA512 cd27cc480cc649f6ba6ea2997bf9a3dc1aa3f655e6f949de27bb4bbfa79927126851604005bf0a0e2be86683f5b9b06dbfb86b919f828e54a79bafcdd6a0be92 WHIRLPOOL 82e25e743b62566dd99a630fb347966195a93b8eba51a300907e04e7113c5bc39a0bf74da28eeba6325558ff86d1bdea80cfe8c7fedf70ce5466e224e0b648c0 diff --git a/media-gfx/geeqie/geeqie-1.2.3.ebuild b/media-gfx/geeqie/geeqie-1.2.3.ebuild new file mode 100644 index 000..f5eb2d9 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.2.3.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit autotools + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="http://www.geeqie.org/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif gtk3 jpeg lcms lirc lua tiff xmp" + +RDEPEND="gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + virtual/libintl + doc? ( app-text/gnome-doc-utils ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( >=dev-lang/lua-5.1:= ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) + tiff? ( media-libs/tiff:0 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-util/intltool + sys-devel/gettext" + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.2-fix_keywords_gtk3.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + # clutter does not compile, gps depends on clutter + local myconf="--disable-dependency-tracking + --with-readmedir=/usr/share/doc/${PF} + --disable-clutter + --disable-gps + $(use_enable debug debug-log) + $(use_enable gtk3) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable tiff)" + + if use exif || use xmp; then + myconf="${myconf} --enable-exiv2" + else + myconf="${myconf} --disable-exiv2" + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + rm -f "${D}/usr/share/doc/${PF}/COPYING" + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README +} + +pkg_postinst() { + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/ufraw" +}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
commit: e0dc868530cd2b24e4a66ce4eeef12c126429b1e Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Apr 13 09:13:23 2016 + Commit: Bernard Cafarelli gentoo org> CommitDate: Wed Apr 13 09:13:36 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0dc8685 media-gfx/geeqie: drop old versions Package-Manager: portage-2.2.28 media-gfx/geeqie/Manifest | 2 - .../files/geeqie-1.2-fix-lcms2-integration.patch | 35 -- .../geeqie/files/geeqie-1.2-fix_version.patch | 11 --- media-gfx/geeqie/geeqie-1.2-r1.ebuild | 79 -- media-gfx/geeqie/geeqie-1.2.1.ebuild | 71 --- media-gfx/geeqie/geeqie-1.2.2-r1.ebuild| 74 media-gfx/geeqie/geeqie-1.2.2.ebuild | 71 --- 7 files changed, 343 deletions(-) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 4c72771..cb93df5 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,4 +1,2 @@ -DIST geeqie-1.2.1.tar.gz 1943377 SHA256 4611edfb25147d8cc98c0b64bef14a8fc7ab0996b662a1e19097eae21f6bf1d9 SHA512 d14069a333eb49f2bba1865d19facf2731b8d46fb95727c168cdb035bb8dcec55440f57170ed67e6d52349e92141066ea2293ca2040622970b30a3505a6902a4 WHIRLPOOL 85624263ebcaf8de54a4847110761cadc0b01a347b221ff9c303b63d556b8c62fd468d3426a98dabb01b035ebc442cab0075fa525660c9410662f12a95cbc1b7 DIST geeqie-1.2.2.tar.xz 1156616 SHA256 e1cbc403650730e2f4092159e4347c858d3d81e4374d2a51d635234ba90b3ee3 SHA512 0e134802b42061e76ec2f2d9069ab13ebcab17f889b04917e15aba74a208a4c4ffa5a957f45eb5bd14917d98d2d6250c1085cb065a1ae487050e5e2f325c14c4 WHIRLPOOL 78e960d2e551675b6474d30cfb0119177e14d1930a23b930c5b7ef7757092085db423713be495a4fcb51112c293eb88b12fe511b5b4bf64c86c27b8e410cb318 DIST geeqie-1.2.3.tar.xz 1129804 SHA256 2629bf33a9070fad4804b1ef051c3bf8a8fdad3bba4e6188dc20588185003248 SHA512 1bb2a6e5782cdafb4aeb1ab9247f7d43f4ef341594ea795214c136ba1fe416cf8bc37faa43462780eca3d0b07a7852e27719f8d23c8bdb42c899857846b4f7b1 WHIRLPOOL 8b4ee7218bb1562695c5c5322e684652f9318f04ed77bc0a54e70dd46f63801a7f0cc9c9b37346a58f6c1059278c07f980dec439dd753f2f87ce7f2a98e01566 -DIST geeqie-1.2.tar.gz 1904764 SHA256 f13fc2489fb9bed31ed48aec8b2a3a573c11cd6e036f1b07ed2cf6495ccc75dd SHA512 cd27cc480cc649f6ba6ea2997bf9a3dc1aa3f655e6f949de27bb4bbfa79927126851604005bf0a0e2be86683f5b9b06dbfb86b919f828e54a79bafcdd6a0be92 WHIRLPOOL 82e25e743b62566dd99a630fb347966195a93b8eba51a300907e04e7113c5bc39a0bf74da28eeba6325558ff86d1bdea80cfe8c7fedf70ce5466e224e0b648c0 diff --git a/media-gfx/geeqie/files/geeqie-1.2-fix-lcms2-integration.patch b/media-gfx/geeqie/files/geeqie-1.2-fix-lcms2-integration.patch deleted file mode 100644 index 5f13c92..000 --- a/media-gfx/geeqie/files/geeqie-1.2-fix-lcms2-integration.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a1afabd3ce740872a857234b91eeb64fcf239f6a Mon Sep 17 00:00:00 2001 -From: Klaus Ethgen -Date: Sat, 27 Sep 2014 12:07:10 +0100 -Subject: [PATCH] Fix lcms2 integration - -Thanks Michael Schwendt for the bug reporting and -the patch. - src/color-man.c | 10 ++ - 1 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/color-man.c b/src/color-man.c -index 7788c7a..e4f1bab 100644 a/src/color-man.c -+++ b/src/color-man.c -@@ -432,10 +432,12 @@ static gchar *color_man_get_profile_name(ColorManProfileType type, cmsHPROFILE p - if (profile) - { - #ifdef HAVE_LCMS2 -- cmsUInt8Number profileID[17]; -- profileID[16] = '\0'; -- cmsGetHeaderProfileID(profile, profileID); -- return g_strdup((gchar *) profileID); -+ cmsUInt32Number r; -+ char buffer[20]; -+ buffer[0] = '\0'; -+ r = cmsGetProfileInfoASCII(profile, cmsInfoDescription, "en", "US", &buffer, 20); -+ buffer[19] = '\0'; /* Just to be sure */ -+ return g_strdup(buffer); - #else - return g_strdup(cmsTakeProductName(profile)); - #endif --- -1.7.1 - diff --git a/media-gfx/geeqie/files/geeqie-1.2-fix_version.patch b/media-gfx/geeqie/files/geeqie-1.2-fix_version.patch deleted file mode 100644 index 1d40ea0..000 --- a/media-gfx/geeqie/files/geeqie-1.2-fix_version.patch +++ /dev/null @@ -1,11 +0,0 @@ configure.in.orig 2014-10-26 20:33:53.431516625 +0100 -+++ configure.in 2014-10-26 20:33:58.790520392 +0100 -@@ -15,7 +15,7 @@ - dnl GNU General Public License for more details. - - AC_PREREQ(2.57) --AC_INIT(geeqie, 1.1, geeqie-de...@lists.sourceforge.net) -+AC_INIT(geeqie, 1.2, geeqie-de...@lists.sourceforge.net) - - # Check for rightly dirs - AC_CONFIG_SRCDIR([src/main.c]) diff --git a/media-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: a70fc336163d75978ecf0bd64116f81d7156d529 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Mar 6 12:55:29 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Mar 6 12:58:26 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a70fc336 media-gfx/geeqie: amd64 stable wrt bug #575696 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> media-gfx/geeqie/geeqie-1.2.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild index e947a6d..116fea5 100644 --- a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild +++ b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="debug doc exif gtk3 jpeg lcms lirc lua tiff xmp" RDEPEND="gtk3? ( x11-libs/gtk+:3 )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: bec5980b262014a4dd470c2373d281405022204a Author: Markus Meier gentoo org> AuthorDate: Fri Feb 19 17:16:33 2016 + Commit: Markus Meier gentoo org> CommitDate: Fri Feb 19 17:16:33 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec5980b media-gfx/geeqie: add subslot operator for all media-gfx/exiv2 atoms Package-Manager: portage-2.2.27 media-gfx/geeqie/geeqie-1.2-r1.ebuild | 4 ++-- media-gfx/geeqie/geeqie-1.2.1.ebuild| 4 ++-- media-gfx/geeqie/geeqie-1.2.2-r1.ebuild | 4 ++-- media-gfx/geeqie/geeqie-1.2.2-r2.ebuild | 2 +- media-gfx/geeqie/geeqie-1.2.2.ebuild| 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/media-gfx/geeqie/geeqie-1.2-r1.ebuild b/media-gfx/geeqie/geeqie-1.2-r1.ebuild index 1450f80..a3a810d 100644 --- a/media-gfx/geeqie/geeqie-1.2-r1.ebuild +++ b/media-gfx/geeqie/geeqie-1.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -23,7 +23,7 @@ RDEPEND="x11-libs/gtk+:2 lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) tiff? ( media-libs/tiff:0 )" DEPEND="${RDEPEND} virtual/pkgconfig diff --git a/media-gfx/geeqie/geeqie-1.2.1.ebuild b/media-gfx/geeqie/geeqie-1.2.1.ebuild index d5e374e..b654441 100644 --- a/media-gfx/geeqie/geeqie-1.2.1.ebuild +++ b/media-gfx/geeqie/geeqie-1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -24,7 +24,7 @@ RDEPEND="gtk3? ( x11-libs/gtk+:3 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) tiff? ( media-libs/tiff:0 )" DEPEND="${RDEPEND} virtual/pkgconfig diff --git a/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild index 7615742..d60ed58 100644 --- a/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild +++ b/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -23,7 +23,7 @@ RDEPEND="gtk3? ( x11-libs/gtk+:3 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) tiff? ( media-libs/tiff:0 )" DEPEND="${RDEPEND} virtual/pkgconfig diff --git a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild index 91b99a3..e947a6d 100644 --- a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild +++ b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild @@ -23,7 +23,7 @@ RDEPEND="gtk3? ( x11-libs/gtk+:3 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) tiff? ( media-libs/tiff:0 )" DEPEND="${RDEPEND} virtual/pkgconfig diff --git a/media-gfx/geeqie/geeqie-1.2.2.ebuild b/media-gfx/geeqie/geeqie-1.2.2.ebuild index 46fb374..9212c0f 100644 --- a/media-gfx/geeqie/geeqie-1.2.2.ebuild +++ b/media-gfx/geeqie/geeqie-1.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -23,7 +23,7 @@ RDEPEND="gtk3? ( x11-libs/gtk+:3 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) tiff? ( media-libs/tiff:0 )" DEPEND="${RDEPEND} virtual/pkgconfig
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/files/, media-gfx/geeqie/
commit: 4c6a7c9c7a0c89ed5ca0fa78a49991ea37f6a2d9 Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Jan 4 09:27:03 2016 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Jan 4 09:27:20 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c6a7c9c media-gfx/geeqie: fix keywords widget with GTK3 Patch provided by Tomasz Golinski alpha.uwb.edu.pl> Bug: 561912 Package-Manager: portage-2.2.26 .../files/geeqie-1.2.2-fix_keywords_gtk3.patch | 12 media-gfx/geeqie/geeqie-1.2.2-r2.ebuild| 76 ++ 2 files changed, 88 insertions(+) diff --git a/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch b/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch new file mode 100644 index 000..99bc10d --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch @@ -0,0 +1,12 @@ +--- a/src/bar_keywords.c 2015-05-23 14:20:43.0 +0200 b/src/bar_keywords.c 2015-12-30 00:34:21.453531792 +0100 +@@ -1295,6 +1295,9 @@ + g_object_set_data(G_OBJECT(pkd->widget), "pane_data", pkd); + g_signal_connect(G_OBJECT(pkd->widget), "destroy", +G_CALLBACK(bar_pane_keywords_destroy), pkd); ++#if GTK_CHECK_VERSION(3,0,0) ++ gtk_widget_set_size_request(pkd->widget, -1, 400); ++#endif + gtk_widget_show(hbox); + + scrolled = gtk_scrolled_window_new(NULL, NULL); diff --git a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild new file mode 100644 index 000..91b99a3 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="http://www.geeqie.org/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif gtk3 jpeg lcms lirc lua tiff xmp" + +RDEPEND="gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + virtual/libintl + doc? ( app-text/gnome-doc-utils ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( >=dev-lang/lua-5.1:= ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) + tiff? ( media-libs/tiff:0 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-util/intltool + sys-devel/gettext" + +src_prepare() { + epatch "${FILESDIR}"/${P}-fix_keywords_gtk3.patch + + epatch_user + + eautoreconf +} + +src_configure() { + # clutter does not compile, gps depends on clutter + local myconf="--disable-dependency-tracking + --with-readmedir=/usr/share/doc/${PF} + --disable-clutter + --disable-gps + $(use_enable debug debug-log) + $(use_enable gtk3) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable tiff)" + + if use exif || use xmp; then + myconf="${myconf} --enable-exiv2" + else + myconf="${myconf} --disable-exiv2" + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + rm -f "${D}/usr/share/doc/${PF}/COPYING" + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README +} + +pkg_postinst() { + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/ufraw" +}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: df72799325cfa7f2b57fe0af72d6a4f7d2574908 Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Oct 26 12:56:19 2015 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Oct 26 12:56:32 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df727993 media-gfx/geeqie: fix docs install, bug #561912 Package-Manager: portage-2.2.23 media-gfx/geeqie/geeqie-1.2.2-r1.ebuild | 74 + 1 file changed, 74 insertions(+) diff --git a/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild new file mode 100644 index 000..7615742 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.2.2-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="http://www.geeqie.org/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif gtk3 jpeg lcms lirc lua tiff xmp" + +RDEPEND="gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + virtual/libintl + doc? ( app-text/gnome-doc-utils ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( >=dev-lang/lua-5.1:= ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) + tiff? ( media-libs/tiff:0 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-util/intltool + sys-devel/gettext" + +src_prepare() { + epatch_user + + eautoreconf +} + +src_configure() { + # clutter does not compile, gps depends on clutter + local myconf="--disable-dependency-tracking + --with-readmedir=/usr/share/doc/${PF} + --disable-clutter + --disable-gps + $(use_enable debug debug-log) + $(use_enable gtk3) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable tiff)" + + if use exif || use xmp; then + myconf="${myconf} --enable-exiv2" + else + myconf="${myconf} --disable-exiv2" + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + rm -f "${D}/usr/share/doc/${PF}/COPYING" + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README +} + +pkg_postinst() { + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/ufraw" +}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: aaff0d8bcf15904ed71b9f9f2a94ac546cd8205a Author: Bernard Cafarelli gentoo org> AuthorDate: Sat Oct 3 21:06:04 2015 + Commit: Bernard Cafarelli gentoo org> CommitDate: Sat Oct 3 21:06:16 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaff0d8b media-gfx/geeqie: use eautoreconf again, bug #562086 by rhill Package-Manager: portage-2.2.22 media-gfx/geeqie/geeqie-1.2.2.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/media-gfx/geeqie/geeqie-1.2.2.ebuild b/media-gfx/geeqie/geeqie-1.2.2.ebuild index 045e981..46fb374 100644 --- a/media-gfx/geeqie/geeqie-1.2.2.ebuild +++ b/media-gfx/geeqie/geeqie-1.2.2.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -inherit eutils +inherit autotools eutils DESCRIPTION="A lightweight GTK image viewer forked from GQview" HOMEPAGE="http://www.geeqie.org"; @@ -32,6 +32,8 @@ DEPEND="${RDEPEND} src_prepare() { epatch_user + + eautoreconf } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 6cb647a384e9ab7bcf57db714a2fb6bddf059818 Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Oct 2 11:52:12 2015 + Commit: Bernard Cafarelli gentoo org> CommitDate: Fri Oct 2 11:52:22 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cb647a3 media-gfx/geeqie: version bump, bug #561912 Package-Manager: portage-2.2.22 media-gfx/geeqie/Manifest| 1 + media-gfx/geeqie/geeqie-1.2.2.ebuild | 69 2 files changed, 70 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index a470c29..3dc218b 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,2 +1,3 @@ DIST geeqie-1.2.1.tar.gz 1943377 SHA256 4611edfb25147d8cc98c0b64bef14a8fc7ab0996b662a1e19097eae21f6bf1d9 SHA512 d14069a333eb49f2bba1865d19facf2731b8d46fb95727c168cdb035bb8dcec55440f57170ed67e6d52349e92141066ea2293ca2040622970b30a3505a6902a4 WHIRLPOOL 85624263ebcaf8de54a4847110761cadc0b01a347b221ff9c303b63d556b8c62fd468d3426a98dabb01b035ebc442cab0075fa525660c9410662f12a95cbc1b7 +DIST geeqie-1.2.2.tar.xz 1156616 SHA256 e1cbc403650730e2f4092159e4347c858d3d81e4374d2a51d635234ba90b3ee3 SHA512 0e134802b42061e76ec2f2d9069ab13ebcab17f889b04917e15aba74a208a4c4ffa5a957f45eb5bd14917d98d2d6250c1085cb065a1ae487050e5e2f325c14c4 WHIRLPOOL 78e960d2e551675b6474d30cfb0119177e14d1930a23b930c5b7ef7757092085db423713be495a4fcb51112c293eb88b12fe511b5b4bf64c86c27b8e410cb318 DIST geeqie-1.2.tar.gz 1904764 SHA256 f13fc2489fb9bed31ed48aec8b2a3a573c11cd6e036f1b07ed2cf6495ccc75dd SHA512 cd27cc480cc649f6ba6ea2997bf9a3dc1aa3f655e6f949de27bb4bbfa79927126851604005bf0a0e2be86683f5b9b06dbfb86b919f828e54a79bafcdd6a0be92 WHIRLPOOL 82e25e743b62566dd99a630fb347966195a93b8eba51a300907e04e7113c5bc39a0bf74da28eeba6325558ff86d1bdea80cfe8c7fedf70ce5466e224e0b648c0 diff --git a/media-gfx/geeqie/geeqie-1.2.2.ebuild b/media-gfx/geeqie/geeqie-1.2.2.ebuild new file mode 100644 index 000..045e981 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.2.2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="http://www.geeqie.org/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif gtk3 jpeg lcms lirc lua tiff xmp" + +RDEPEND="gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + virtual/libintl + doc? ( app-text/gnome-doc-utils ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( >=dev-lang/lua-5.1:= ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) + tiff? ( media-libs/tiff:0 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-util/intltool + sys-devel/gettext" + +src_prepare() { + epatch_user +} + +src_configure() { + # clutter does not compile, gps depends on clutter + local myconf="--disable-dependency-tracking + --with-readmedir=/usr/share/doc/${PF} + --disable-clutter + --disable-gps + $(use_enable debug debug-log) + $(use_enable gtk3) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable tiff)" + + if use exif || use xmp; then + myconf="${myconf} --enable-exiv2" + else + myconf="${myconf} --disable-exiv2" + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + rm -f "${D}/usr/share/doc/${MY_P}/COPYING" +} + +pkg_postinst() { + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/ufraw" +}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
commit: 44835f4abe8a7cfc40160bc6520aa8ce829f9d72 Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Sep 1 20:59:50 2015 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Sep 1 21:00:00 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44835f4a media-gfx/geeqie: version bump, allow gtk3 build Bug: 559262 Package-Manager: portage-2.2.20.1 media-gfx/geeqie/Manifest| 1 + media-gfx/geeqie/geeqie-1.2.1.ebuild | 71 media-gfx/geeqie/metadata.xml| 3 ++ 3 files changed, 75 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 8799272..a470c29 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1 +1,2 @@ +DIST geeqie-1.2.1.tar.gz 1943377 SHA256 4611edfb25147d8cc98c0b64bef14a8fc7ab0996b662a1e19097eae21f6bf1d9 SHA512 d14069a333eb49f2bba1865d19facf2731b8d46fb95727c168cdb035bb8dcec55440f57170ed67e6d52349e92141066ea2293ca2040622970b30a3505a6902a4 WHIRLPOOL 85624263ebcaf8de54a4847110761cadc0b01a347b221ff9c303b63d556b8c62fd468d3426a98dabb01b035ebc442cab0075fa525660c9410662f12a95cbc1b7 DIST geeqie-1.2.tar.gz 1904764 SHA256 f13fc2489fb9bed31ed48aec8b2a3a573c11cd6e036f1b07ed2cf6495ccc75dd SHA512 cd27cc480cc649f6ba6ea2997bf9a3dc1aa3f655e6f949de27bb4bbfa79927126851604005bf0a0e2be86683f5b9b06dbfb86b919f828e54a79bafcdd6a0be92 WHIRLPOOL 82e25e743b62566dd99a630fb347966195a93b8eba51a300907e04e7113c5bc39a0bf74da28eeba6325558ff86d1bdea80cfe8c7fedf70ce5466e224e0b648c0 diff --git a/media-gfx/geeqie/geeqie-1.2.1.ebuild b/media-gfx/geeqie/geeqie-1.2.1.ebuild new file mode 100644 index 000..d5e374e --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.2.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +# Grab from tag snapshot: http://www.geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git +SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc exif gtk3 jpeg lcms lirc lua tiff xmp" + +RDEPEND="gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + virtual/libintl + doc? ( app-text/gnome-doc-utils ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( >=dev-lang/lua-5.1:= ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) + tiff? ( media-libs/tiff:0 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-util/intltool + sys-devel/gettext" + +src_prepare() { + epatch_user + + eautoreconf +} + +src_configure() { + # Force disable experimental stuff + local myconf="--disable-dependency-tracking + --with-readmedir=/usr/share/doc/${PF} + --disable-clutter + --disable-gps + $(use_enable gtk3) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable tiff)" + + if use exif || use xmp; then + myconf="${myconf} --enable-exiv2" + else + myconf="${myconf} --disable-exiv2" + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + rm -f "${D}/usr/share/doc/${MY_P}/COPYING" +} + +pkg_postinst() { + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/ufraw" +} diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml index aed8fe3..7af1690 100644 --- a/media-gfx/geeqie/metadata.xml +++ b/media-gfx/geeqie/metadata.xml @@ -6,4 +6,7 @@ Bernard Cafarelli Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool + + Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2 +