diff options
Diffstat (limited to 'graphics/geeqie')
-rw-r--r-- | graphics/geeqie/Makefile | 4 | ||||
-rw-r--r-- | graphics/geeqie/distinfo | 14 | ||||
-rw-r--r-- | graphics/geeqie/options.mk | 6 | ||||
-rw-r--r-- | graphics/geeqie/patches/patch-Makefile.am | 15 | ||||
-rw-r--r-- | graphics/geeqie/patches/patch-src_misc.c | 18 | ||||
-rw-r--r-- | graphics/geeqie/patches/patch-src_pan-view_pan-util.c | 20 |
6 files changed, 23 insertions, 54 deletions
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile index 3d2c4c96f87..68e7d2a6c9e 100644 --- a/graphics/geeqie/Makefile +++ b/graphics/geeqie/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.80 2019/07/30 13:03:18 ryoon Exp $ +# $NetBSD: Makefile,v 1.81 2019/09/16 21:55:46 nia Exp $ -DISTNAME= geeqie-1.5 +DISTNAME= geeqie-1.5.1 CATEGORIES= graphics MASTER_SITES= http://www.geeqie.org/ EXTRACT_SUFX= .tar.xz diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo index 2abce727510..6de418909e3 100644 --- a/graphics/geeqie/distinfo +++ b/graphics/geeqie/distinfo @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.14 2019/07/30 13:03:18 ryoon Exp $ +$NetBSD: distinfo,v 1.15 2019/09/16 21:55:46 nia Exp $ -SHA1 (geeqie-1.5.tar.xz) = c7dd9372a497714e8aa52b42e1caad8a96fad030 -RMD160 (geeqie-1.5.tar.xz) = 663e2c3510ca2e79e44daa5ecf8ef72869633c59 -SHA512 (geeqie-1.5.tar.xz) = 2b87d543d8d77a4fec331fd1b73ca2038912362fc1f94c9b0f163dcc7c2dd58118e175c5540aecafb0581708ea5c2a5a321dde09f644e2322bd4ca5c0284b722 -Size (geeqie-1.5.tar.xz) = 1585780 bytes -SHA1 (patch-Makefile.am) = 49aba28dcb6a3671550ddab5c80d93f3a094d47f +SHA1 (geeqie-1.5.1.tar.xz) = fe14b122744a4297e9e98a9cfc5821f2b5e6e1ce +RMD160 (geeqie-1.5.1.tar.xz) = 90627c49e53d9389bcbb8feec5315cd02a5ea616 +SHA512 (geeqie-1.5.1.tar.xz) = 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac +Size (geeqie-1.5.1.tar.xz) = 1587116 bytes +SHA1 (patch-Makefile.am) = 74aa2631b468d7984a4a02ad827d839cfe2155b9 SHA1 (patch-ac) = e551d5e733354902254c1a392be5738da6c88170 SHA1 (patch-doc_Makefile.am) = 9ffbcd6f8e5bc5710b61dfbfb020e92497d3414f SHA1 (patch-src_layout__util.c) = c7ee3ea2e9874e32df21ebecad22758d9ccc17c3 -SHA1 (patch-src_misc.c) = ce18eb36b6bd31b99b190f4d4377cd50db67abba -SHA1 (patch-src_pan-view_pan-util.c) = ac965257003cd9da5dbd0c2f2452ed50a5889021 diff --git a/graphics/geeqie/options.mk b/graphics/geeqie/options.mk index 417f7f041d8..5ca3f58dc80 100644 --- a/graphics/geeqie/options.mk +++ b/graphics/geeqie/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.4 2019/07/26 09:44:03 nia Exp $ +# $NetBSD: options.mk,v 1.5 2019/09/16 21:55:46 nia Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.geeqie +PKG_OPTIONS_VAR= PKG_OPTIONS.geeqie PKG_OPTIONS_OPTIONAL_GROUPS= gtk -PKG_OPTIONS_GROUP.gtk= gtk2 gtk3 +PKG_OPTIONS_GROUP.gtk= gtk2 gtk3 PKG_SUPPORTED_OPTIONS= libchamplain # The libchamplain option doesn't actually work, so leave it off # to avoid the pain of dependencies with no benefit, until debugged. diff --git a/graphics/geeqie/patches/patch-Makefile.am b/graphics/geeqie/patches/patch-Makefile.am index e54dc0239bd..642564e7789 100644 --- a/graphics/geeqie/patches/patch-Makefile.am +++ b/graphics/geeqie/patches/patch-Makefile.am @@ -1,18 +1,27 @@ -$NetBSD: patch-Makefile.am,v 1.1 2018/01/10 09:38:32 wiz Exp $ +$NetBSD: patch-Makefile.am,v 1.2 2019/09/16 21:55:46 nia Exp $ ChangeLog files are not in distfile. ---- Makefile.am.orig 2017-12-31 12:31:21.000000000 +0000 +--- Makefile.am.orig 2019-08-20 19:01:23.000000000 +0000 +++ Makefile.am @@ -10,9 +10,9 @@ man_MANS = geeqie.1 readmedir = @readmedir@ if HAVE_MARKDOWN -readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html -+readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html ++readme_DATA = README.md COPYING TODO README.lirc AUTHORS else -readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html +readme_DATA = README.md COPYING TODO README.lirc AUTHORS endif desktopdir = $(datadir)/applications +@@ -35,7 +35,7 @@ dist-hook: geeqie.spec + cp $(top_builddir)/geeqie.spec $(distdir) + + DISTCLEANFILES = config.report +-CLEANFILES = $(desktop_DATA) ChangeLog.html ++CLEANFILES = $(desktop_DATA) + + .PHONY: ChangeLog + ChangeLog.html: diff --git a/graphics/geeqie/patches/patch-src_misc.c b/graphics/geeqie/patches/patch-src_misc.c deleted file mode 100644 index dc2eb1b33ed..00000000000 --- a/graphics/geeqie/patches/patch-src_misc.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-src_misc.c,v 1.1 2019/07/30 13:03:18 ryoon Exp $ - -* _NL_TIME_FIRST_WEEKDAY is not universal and return Sunday=1 instead. - ---- src/misc.c.orig 2019-07-26 18:19:11.000000000 +0000 -+++ src/misc.c -@@ -249,7 +249,11 @@ int runcmd(gchar *cmd) - */ - gint date_get_first_day_of_week() - { -+#if defined(_NL_TIME_FIRST_WEEKDAY) - return nl_langinfo(_NL_TIME_FIRST_WEEKDAY)[0]; -+#else -+ return 1; -+#endif - } - - /** diff --git a/graphics/geeqie/patches/patch-src_pan-view_pan-util.c b/graphics/geeqie/patches/patch-src_pan-view_pan-util.c deleted file mode 100644 index 3744fc0e828..00000000000 --- a/graphics/geeqie/patches/patch-src_pan-view_pan-util.c +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-src_pan-view_pan-util.c,v 1.1 2019/07/30 13:03:18 ryoon Exp $ - -* __GLIBC_PREREQ is not universal. - ---- src/pan-view/pan-util.c.orig 2019-07-26 18:19:11.000000000 +0000 -+++ src/pan-view/pan-util.c -@@ -99,8 +99,12 @@ gchar *pan_date_value_string(time_t d, P - format = "%A %e"; - break; - case PAN_DATE_LENGTH_MONTH: --#if __GLIBC_PREREQ(2, 27) -+#if defined(__GLIBC_PREREQ) -+# if __GLIBC_PREREQ(2, 27) - format = "%OB %Y"; -+# else -+ format = "%B %Y"; -+# endif - #else - format = "%B %Y"; - #endif |