[113274] trunk/dports/gnome/file-roller

[devans at macports.org]

Revision: 113274
          https://trac.macports.org/changeset/113274
Author:   devans at macports.org
Date:     2013-11-13 01:28:09 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
file-roller: merge version 3.8.4 from GNOME-3 test branch.

Modified Paths:
--------------
    trunk/dports/gnome/file-roller/Portfile
    trunk/dports/gnome/file-roller/files/patch-src-fr-command-lrzip.c.diff

Property Changed:
----------------
    trunk/dports/gnome/file-roller/


Property changes on: trunk/dports/gnome/file-roller
___________________________________________________________________
Added: svn:mergeinfo
   + /users/devans/GNOME-3/stable/dports/gnome/file-roller:108269-113174

Modified: trunk/dports/gnome/file-roller/Portfile
===================================================================
--- trunk/dports/gnome/file-roller/Portfile	2013-11-13 09:27:58 UTC (rev 113273)
+++ trunk/dports/gnome/file-roller/Portfile	2013-11-13 09:28:09 UTC (rev 113274)
@@ -4,8 +4,7 @@
 PortSystem      1.0
 
 name            file-roller
-version         2.32.2
-revision        1
+version         3.10.1
 license         GPL-2+
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     An archive manager for GNOME
@@ -22,29 +21,33 @@
 homepage        http://fileroller.sourceforge.net/
 master_sites    gnome:sources/${name}/${branch}/
 
-use_bzip2       yes
+use_xz          yes
 
-checksums       rmd160  cbeb4f8dc83db87338735e57c4f87333c4b018f4 \
-                sha256  3ddbe4e4134eab4ff8e97789a1626aec6cbc588190f2f520850d0697037e5755
+checksums       rmd160  4946cd1e49a2689c3cd583184c339ac7f93f6071 \
+                sha256  7b180bcf98eaf19835926c694ec5262a421f3a0271f030ca338ccf7f6846a80f
 
 depends_build   port:pkgconfig \
                 port:intltool \
-                port:gnome-doc-utils
+                port:yelp-tools
 
 depends_lib     port:desktop-file-utils \
-                port:gtk2 \
-                port:gconf
+                port:gtk3 \
+                port:json-glib \
+                port:libnotify \
+                port:libmagic \
+                port:libarchive \
+                port:xorg-libsm \
+                port:xorg-libice
 
 depends_run     port:gnome-settings-daemon \
                 port:yelp
 
 patchfiles      patch-src-fr-command-lrzip.c.diff
 
-configure.args  --with-gtk=2.0 \
+configure.args  --with-smclient=xsmp \
                 --disable-nautilus-actions \
                 --disable-packagekit \
-                --disable-schemas-install \
-                --disable-scrollkeeper \
+                --disable-schemas-compile \
                 --disable-silent-rules
 
 # Don't do intltool's INTLTOOL_PERL dance
@@ -57,11 +60,9 @@
 }
 
 post-activate {
-    system "${prefix}/bin/scrollkeeper-update"
-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+    system "${prefix}/bin/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

Modified: trunk/dports/gnome/file-roller/files/patch-src-fr-command-lrzip.c.diff
===================================================================
--- trunk/dports/gnome/file-roller/files/patch-src-fr-command-lrzip.c.diff	2013-11-13 09:27:58 UTC (rev 113273)
+++ trunk/dports/gnome/file-roller/files/patch-src-fr-command-lrzip.c.diff	2013-11-13 09:28:09 UTC (rev 113274)
@@ -1,6 +1,6 @@
---- src/fr-command-lrzip.c.orig	2013-05-13 08:35:39.000000000 -0700
-+++ src/fr-command-lrzip.c	2013-05-13 08:38:45.000000000 -0700
-@@ -52,7 +52,11 @@
+--- src/fr-command-lrzip.c.orig	2013-07-01 23:50:46.000000000 -0700
++++ src/fr-command-lrzip.c	2013-08-31 13:04:18.000000000 -0700
+@@ -45,7 +45,11 @@
  
  	struct stat st;
  	if (stat (comm->filename, &st) == 0)
@@ -12,4 +12,4 @@
 +#endif
  	else
  		time(&(fdata->modified));
- 	fdata->encrypted = FALSE;
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/a76d9300/attachment.html>