[111295] users/devans/GNOME-3/stable/dports/gnome/gnome-control-center
devans at macports.org
devans at macports.org
Wed Sep 18 09:33:48 PDT 2013
Revision: 111295
https://trac.macports.org/changeset/111295
Author: devans at macports.org
Date: 2013-09-18 09:33:47 -0700 (Wed, 18 Sep 2013)
Log Message:
-----------
users/devans/GNOME-3/stable/dports: update gnome-control-center to version 3.8.5.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-disable-color-panel.diff
users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-disable-shell-test-hostname.diff
users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-panels-user-accounts.diff
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/glib-2.32.patch
users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-libslab-director-tile.c.diff
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2013-09-18 16:08:38 UTC (rev 111294)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2013-09-18 16:33:47 UTC (rev 111295)
@@ -4,9 +4,10 @@
PortSystem 1.0
name gnome-control-center
-version 2.32.1
+version 3.8.5
set branch [join [lrange [split ${version} .] 0 1] .]
-description Control center for GNOME 2.0 project.
+description GNOME's main interface for configuration of the various \
+ aspects of your desktop.
long_description ${description}
maintainers devans openmaintainer
categories gnome
@@ -15,84 +16,77 @@
homepage http://www.gnome.org/
master_sites gnome:sources/${name}/${branch}/
-use_bzip2 yes
+use_xz yes
-checksums rmd160 47515f3f96d5695b457a8363bac183fb2188a256 \
- sha256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66
+checksums rmd160 4eca6dc99a251e901f57cabd9d8a5cb752b23e1e \
+ sha256 efb9fb47aaa9a308aed3064efc39356db05d71ddb0374561eeccc57c122212e2
-depends_build port:intltool \
- port:pkgconfig \
- port:gnome-doc-utils \
+depends_build port:pkgconfig \
+ port:intltool \
+ port:libxslt \
port:gnome-common
depends_lib port:desktop-file-utils \
- port:libcanberra \
- port:gtk2 \
- port:gconf \
- port:libxml2 \
+ port:gtk3 \
+ port:gsettings-desktop-schemas \
port:gnome-desktop \
- port:metacity \
+ port:fontconfig \
+ port:policykit \
+ port:libxml2 \
+ port:upower \
+ port:libgtop \
port:gnome-settings-daemon \
- port:librsvg \
port:gnome-menus \
- port:libgnomekbd \
- port:libxklavier \
- port:libunique \
- port:xorg-libXScrnSaver \
+ port:gnome-online-accounts \
+ port:accountsservice \
+ port:libcanberra \
+ port:pulseaudio \
+ port:libpwquality \
+ port:kerberos5 \
+ port:libsocialweb \
+ port:shared-mime-info \
+ port:xorg-libX11 \
port:xorg-libXxf86misc \
- port:xorg-libXcursor \
port:xorg-libXi
-depends_run port:gnome-panel \
- port:gnome-settings-daemon \
- port:yelp
+depends_run port:yelp
-patchfiles glib-2.32.patch
+# color panel disabled by patch, dependency colord requires libudev
-if {${os.platform} == "darwin" && ${os.major} < 9} {
- patchfiles-append patch-libslab-director-tile.c.diff
-}
+patchfiles patch-disable-color-panel.diff \
+ patch-disable-shell-test-hostname.diff \
+ patch-panels-user-accounts.diff
use_autoreconf yes
autoreconf.args -fvi
configure.args --x-includes=${prefix}/include \
--x-libraries=${prefix}/lib \
- --enable-appindicator=no \
- --enable-aboutme=no \
- --disable-silent-rules \
- --disable-scrollkeeper \
+ --with-libsocialweb \
+ --without-cheese \
+ --disable-ibus \
+ --disable-maintainer-mode \
--disable-update-mimedb \
- --disable-schemas-install
+ --disable-silent-rules
-post-destroot {
- file delete ${destroot}${prefix}/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
- file delete ${destroot}${prefix}/share/applications/mimeinfo.cache
+pre-activate {
+ if {![catch {set installed [lindex [registry_active gdm] 0]}]} {
+ set _version [lindex $installed 1]
+ if {[vercmp $_version 3.0.0] < 0} {
+ registry_deactivate_composite gdm "" [list ports_nodepcheck 1]
+ }
+ }
+ if {![catch {set installed [lindex [registry_active gnome-media] 0]}]} {
+ set _version [lindex $installed 1]
+ if {[vercmp $_version 3.10.0] < 0} {
+ registry_deactivate_composite gnome-media "" [list ports_nodepcheck 1]
+ }
+ }
}
post-activate {
- system " \
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`&&\
- gconftool-2 --makefile-install-rule \
- ${prefix}/etc/gconf/schemas/*.schemas &&\
- gconftool-2 --direct --config-source=\$GCONF_CONFIG_SOURCE \
- --recursive-unset /schemas/apps/panel &&\
- gconftool-2 --direct --config-source \
- xml:readwrite:${prefix}/etc/gconf/gconf.xml.defaults \
- --load ${prefix}/etc/gconf/schemas/panel-default-setup.entries "
- system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
- system "${prefix}/bin/scrollkeeper-update"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
- system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
}
-platform darwin {
- post-destroot {
- system "cd ${destroot}${prefix}/lib/window-manager-settings/ && \
- ln -s libmetacity.so libmetacity.dylib"
- system "cd ${destroot}${prefix}/lib && \
- ln -s libgnome-window-settings.1.0.0.dylib libgnome-window-settings.1.0.0.so"
- }
-}
-
livecheck.type gnome
Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/glib-2.32.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/glib-2.32.patch 2013-09-18 16:08:38 UTC (rev 111294)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/glib-2.32.patch 2013-09-18 16:33:47 UTC (rev 111295)
@@ -1,11 +0,0 @@
---- libwindow-settings/Makefile.am.orig 2012-04-22 02:55:05.000000000 -0700
-+++ libwindow-settings/Makefile.am 2012-04-22 02:55:24.000000000 -0700
-@@ -17,7 +17,7 @@ libgnome_window_settings_la_LDFLAGS = \
- -no-undefined \
- -version-info 1:0:0
-
--libgnome_window_settings_la_LIBADD = $(GNOMECC_LIBS)
-+libgnome_window_settings_la_LIBADD = $(GNOMECC_LIBS) -lgmodule-2.0
-
- libgnome_window_settings_la_SOURCES = \
- gnome-window-manager.c \
Added: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-disable-color-panel.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-disable-color-panel.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-disable-color-panel.diff 2013-09-18 16:33:47 UTC (rev 111295)
@@ -0,0 +1,49 @@
+--- configure.ac.orig 2013-09-13 05:09:33.000000000 -0700
++++ configure.ac 2013-09-16 09:28:36.000000000 -0700
+@@ -146,10 +146,10 @@
+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
+- colord >= $COLORD_REQUIRED_VERSION
+- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++dnl PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
++dnl colord >= $COLORD_REQUIRED_VERSION
++dnl colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++dnl gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
+--- panels/Makefile.am.orig 2013-01-25 06:42:18.000000000 -0800
++++ panels/Makefile.am 2013-09-16 09:32:32.000000000 -0700
+@@ -2,7 +2,6 @@
+ common \
+ background \
+ power \
+- color \
+ display \
+ mouse \
+ notifications \
+--- shell/Makefile.am.orig 2013-09-16 17:47:34.000000000 -0700
++++ shell/Makefile.am 2013-09-16 17:48:10.000000000 -0700
+@@ -51,7 +51,6 @@
+ $(top_builddir)/libgd/libgd.la \
+ $(top_builddir)/panels/common/liblanguage.la \
+ $(top_builddir)/panels/background/libbackground.la \
+- $(top_builddir)/panels/color/libcolor.la \
+ $(top_builddir)/panels/datetime/libdate_time.la \
+ $(top_builddir)/panels/display/libdisplay.la \
+ $(top_builddir)/panels/info/libinfo.la \
+--- shell/cc-panel-loader.c.orig 2013-09-16 17:57:33.000000000 -0700
++++ shell/cc-panel-loader.c 2013-09-16 17:58:28.000000000 -0700
+@@ -77,7 +77,9 @@
+ #ifdef BUILD_BLUETOOTH
+ PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
+ #endif
++#ifdef BUILD_COLOR
+ PANEL_TYPE("color", cc_color_panel_get_type ),
++#endif
+ PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
+ PANEL_TYPE("display", cc_display_panel_get_type ),
+ PANEL_TYPE("info", cc_info_panel_get_type ),
Added: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-disable-shell-test-hostname.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-disable-shell-test-hostname.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-disable-shell-test-hostname.diff 2013-09-18 16:33:47 UTC (rev 111295)
@@ -0,0 +1,10 @@
+--- shell/Makefile.am.orig 2013-09-16 22:44:57.000000000 -0700
++++ shell/Makefile.am 2013-09-16 22:45:38.000000000 -0700
+@@ -111,6 +111,6 @@
+
+ EXTRA_DIST += hostnames-test.txt
+ check-local: test-hostname
+- $(builddir)/test-hostname $(srcdir)/hostnames-test.txt > /dev/null
++
+
+ -include $(top_srcdir)/git.mk
Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-libslab-director-tile.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-libslab-director-tile.c.diff 2013-09-18 16:08:38 UTC (rev 111294)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-libslab-director-tile.c.diff 2013-09-18 16:33:47 UTC (rev 111295)
@@ -1,14 +0,0 @@
---- libslab/directory-tile.c.orig 2009-04-30 16:42:53.000000000 -0700
-+++ libslab/directory-tile.c 2009-04-30 16:44:25.000000000 -0700
-@@ -623,8 +623,9 @@
- static void
- disown_spawned_child (gpointer user_data)
- {
-- setsid ();
-- setpgrp ();
-+ pid_t pid;
-+ pid = setsid ();
-+ setpgrp (pid, pid);
- }
-
- static void
Added: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-panels-user-accounts.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-panels-user-accounts.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-panels-user-accounts.diff 2013-09-18 16:33:47 UTC (rev 111295)
@@ -0,0 +1,10 @@
+--- panels/user-accounts/Makefile.am.orig 2013-09-16 17:32:09.000000000 -0700
++++ panels/user-accounts/Makefile.am 2013-09-16 17:33:23.000000000 -0700
+@@ -62,7 +62,6 @@
+ $(USER_ACCOUNTS_PANEL_LIBS) \
+ $(builddir)/../common/liblanguage.la \
+ -lpwquality \
+- -lcrypt \
+ -lm
+
+ if BUILD_CHEESE
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130918/d110ef16/attachment.html>
More information about the macports-changes
mailing list