[141008] trunk/dports/gnome/gthumb
devans at macports.org
devans at macports.org
Wed Oct 7 13:26:53 PDT 2015
Revision: 141008
https://trac.macports.org/changeset/141008
Author: devans at macports.org
Date: 2015-10-07 13:26:53 -0700 (Wed, 07 Oct 2015)
Log Message:
-----------
gthumb: update to version 3.4.1, dependencies, reconfigure using upstream autogen.sh for intltool 0.51 compatibility, add +x11 variant.
Modified Paths:
--------------
trunk/dports/gnome/gthumb/Portfile
Added Paths:
-----------
trunk/dports/gnome/gthumb/files/autogen.sh
trunk/dports/gnome/gthumb/files/patch-configure.ac.diff
trunk/dports/gnome/gthumb/files/patch-gthumb-gth-toolbox.c.diff
Removed Paths:
-------------
trunk/dports/gnome/gthumb/files/patch-configure.diff
Property Changed:
----------------
trunk/dports/gnome/gthumb/
Property changes on: trunk/dports/gnome/gthumb
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/gthumb:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gthumb:126753-141002
/users/rmstonecipher/gnome/gthumb:102363-103172
Modified: trunk/dports/gnome/gthumb/Portfile
===================================================================
--- trunk/dports/gnome/gthumb/Portfile 2015-10-07 20:26:05 UTC (rev 141007)
+++ trunk/dports/gnome/gthumb/Portfile 2015-10-07 20:26:53 UTC (rev 141008)
@@ -4,11 +4,10 @@
PortSystem 1.0
name gthumb
-version 2.14.4
-revision 6
+version 3.4.1
license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
-description Image viewer and browser for the gnome desktop.
+description Image viewer and browser for the GNOME desktop.
long_description ${description}
maintainers nomaintainer
categories gnome
@@ -17,32 +16,49 @@
master_sites gnome:sources/gthumb/${branch}
use_xz yes
-checksums sha256 1561ca52f9b60fbcd0e8fc976de8b30f0447019c698bfe1051d421935b5a51b5 \
- rmd160 384b4441ed3d4022b6e5c5301b5a3c422f8b101b
+checksums sha256 1ec2cf49f499ed06eda851a3bd5c28a1768839a6ff06bc4efc5fbde46cabc857 \
+ rmd160 4e0b5581064a726ab716965ab8fe8fe3754e31c6
-depends_build port:gnome-doc-utils \
- port:intltool \
- port:pkgconfig
+depends_build port:intltool \
+ port:pkgconfig \
+ port:gnome-common \
+ port:yelp-tools \
+ port:itstool \
+ port:autoconf \
+ port:automake \
+ port:libtool
depends_lib port:desktop-file-utils \
- port:gconf \
- port:gstreamer010-gst-plugins-base \
- port:libgnome-keyring \
+ port:gtk3 \
+ port:exiv2 \
+ port:gstreamer1-gst-plugins-base \
+ port:lcms2 \
+ port:libraw \
port:libsoup \
- port:libunique \
- port:exiv2 \
- port:libopenraw
-
+ port:libsecret \
+ port:librsvg \
+ port:webp \
+ port:json-glib
+
depends_run port:yelp
-patchfiles patch-configure.diff
+patchfiles patch-configure.ac.diff \
+ patch-gthumb-gth-toolbox.c.diff
-configure.args --enable-libopenraw \
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
+
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
+configure.cmd ./autogen.sh
+
+configure.args --enable-libraw \
--disable-clutter \
- --disable-gnome-3 \
--disable-libbrasero \
- --disable-scrollkeeper \
- --disable-schemas-install \
+ --disable-webkit2 \
+ --enable-compile-warnings=minimum \
+ --disable-schemas-compile \
--disable-silent-rules
universal_variant no
@@ -56,11 +72,18 @@
configure.args-append --enable-debug
}
+variant x11 {
+ depends_lib-append port:xorg-libsm \
+ port:xorg-libice
+ configure.args-replace --with-smclient=no --with-smclient=xsmp
+}
+
+default_variants +x11
+
post-activate {
- system "gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+ system "gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
- system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
- gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
livecheck.type gnome
Copied: trunk/dports/gnome/gthumb/files/autogen.sh (from rev 141002, users/devans/GNOME-3/stable/dports/gnome/gthumb/files/autogen.sh)
===================================================================
--- trunk/dports/gnome/gthumb/files/autogen.sh (rev 0)
+++ trunk/dports/gnome/gthumb/files/autogen.sh 2015-10-07 20:26:53 UTC (rev 141008)
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="gthumb"
+REQUIRED_AUTOMAKE_VERSION=1.8
+
+(test -f $srcdir/configure.ac \
+ && test -d $srcdir/gthumb) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
+}
+
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common from the GNOME git"
+ exit 1
+}
+
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
Copied: trunk/dports/gnome/gthumb/files/patch-configure.ac.diff (from rev 141002, users/devans/GNOME-3/stable/dports/gnome/gthumb/files/patch-configure.ac.diff)
===================================================================
--- trunk/dports/gnome/gthumb/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/gthumb/files/patch-configure.ac.diff 2015-10-07 20:26:53 UTC (rev 141008)
@@ -0,0 +1,20 @@
+--- configure.ac.orig 2015-04-14 08:12:09.000000000 -0700
++++ configure.ac 2015-04-24 14:26:29.000000000 -0700
+@@ -77,7 +77,7 @@
+ dnl ===========================================================================
+
+ CFLAGS=${CFLAGS-:""}
+-CFLAGS="$CFLAGS -fPIC -DPIC -Wl,--as-needed"
++CFLAGS="$CFLAGS -fPIC -DPIC"
+
+ AC_ARG_ENABLE(deprecated,
+ AS_HELP_STRING([--disable-deprecated], [do not use deprecated API]),
+@@ -106,7 +106,7 @@
+ dnl ===========================================================================
+
+ if test x$ENABLE_DEBUG = xyes; then
+-WARN_CFLAGS="-Wall -Wcast-align -Wtype-limits -Wclobbered -Wempty-body -Wignored-qualifiers -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-sign-compare -Wformat-security"
++WARN_CFLAGS="-Wall -Wcast-align -Wtype-limits -Wempty-body -Wignored-qualifiers -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-sign-compare -Wformat-security"
+ else
+ WARN_CFLAGS="-Wall"
+ fi
Deleted: trunk/dports/gnome/gthumb/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/gthumb/files/patch-configure.diff 2015-10-07 20:26:05 UTC (rev 141007)
+++ trunk/dports/gnome/gthumb/files/patch-configure.diff 2015-10-07 20:26:53 UTC (rev 141008)
@@ -1,11 +0,0 @@
---- configure.orig 2013-01-15 17:43:51.000000000 -0800
-+++ configure 2013-01-15 17:46:15.000000000 -0800
-@@ -17306,7 +17306,7 @@
-
-
- CFLAGS=${CFLAGS-:""}
--CFLAGS="$CFLAGS -fPIC -DPIC -Wl,--as-needed"
-+CFLAGS="$CFLAGS -fPIC -DPIC"
-
- # Check whether --enable-deprecated was given.
- if test "${enable_deprecated+set}" = set; then :
Copied: trunk/dports/gnome/gthumb/files/patch-gthumb-gth-toolbox.c.diff (from rev 141002, users/devans/GNOME-3/stable/dports/gnome/gthumb/files/patch-gthumb-gth-toolbox.c.diff)
===================================================================
--- trunk/dports/gnome/gthumb/files/patch-gthumb-gth-toolbox.c.diff (rev 0)
+++ trunk/dports/gnome/gthumb/files/patch-gthumb-gth-toolbox.c.diff 2015-10-07 20:26:53 UTC (rev 141008)
@@ -0,0 +1,11 @@
+--- gthumb/gth-toolbox.c.orig 2015-05-27 15:17:29.000000000 -0700
++++ gthumb/gth-toolbox.c 2015-05-27 15:18:43.000000000 -0700
+@@ -315,7 +315,7 @@
+ column[i] = -1;
+ }
+
+- for (i = 0; i < children->len; i++) {
++ for (i = 0; i < children->len - 1; i++) {
+ GType child_type;
+ GtkWidget *child;
+ int section;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151007/06702381/attachment.html>
More information about the macports-changes
mailing list