[135359] users/devans/GNOME-3/stable/dports/gnome
devans at macports.org
devans at macports.org
Thu Apr 23 08:22:06 PDT 2015
Revision: 135359
https://trac.macports.org/changeset/135359
Author: devans at macports.org
Date: 2015-04-23 08:22:05 -0700 (Thu, 23 Apr 2015)
Log Message:
-----------
GNOME-3/stable: dconf-editor, new port, edit settings that are stored in the dconf database, previously part of dconf.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/dconf-editor/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/dconf-editor/
users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/autogen.sh
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/patch-fix-lib-names-Makefile.am.diff
Property changes on: users/devans/GNOME-3/stable/dports/gnome/dconf-editor
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/dports/gnome/dconf:113289-117677
/users/devans/GNOME-3/unstable/dports/gnome/dconf:116416-118151,122424-125568,133860-134459
Modified: users/devans/GNOME-3/stable/dports/gnome/dconf-editor/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile 2015-03-20 15:11:06 UTC (rev 134246)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf-editor/Portfile 2015-04-23 15:22:05 UTC (rev 135359)
@@ -3,59 +3,55 @@
PortSystem 1.0
-name dconf
-version 0.22.0
+name dconf-editor
+version 3.16.1
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers devans openmaintainer
categories gnome
platforms darwin
license GPL-2+
-description dconf is a simple key/value storage system that is heavily optimised for \
- reading.
+description The dconf-editor program provides a graphical interface \
+ for editing settings that are stored in the dconf database.
long_description ${description} \
- This makes it an ideal system for storing user preferences \
- (which are read 1000s of times for each time the user changes one).
-
+ Previously part of dconf, it is now a stand-alone module.
+
homepage https://wiki.gnome.org/Projects/dconf
master_sites gnome:sources/${name}/${branch}/
use_xz yes
-checksums rmd160 a69abcb409ebdb3a72923ecbb23cbf5b43a5f98c \
- sha256 0a277cb0c3f09e77d9413c5a9b3577fc2b5d6e941b59b44940392e024a224b8e
+checksums rmd160 03441138108ec127dc96255fd2857c7926c3c064 \
+ sha256 085d1d4f2acc0400b096d0dfbfcb118fd0de61a5647010ce988b2e04d7f3856e
depends_build port:pkgconfig \
port:intltool \
- port:gtk-doc \
- port:libxslt
+ port:docbook-xsl \
+ port:libxslt \
+ port:autoconf \
+ port:automake
depends_lib port:desktop-file-utils \
+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
+ port:dconf \
port:gtk3 \
- port:dbus \
- port:libxml2 \
- port:vala
+ port:libxml2
-patchfiles patch-fix-lib-names-Makefile.am.diff
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
-# update m4/intltool.m4 and autoreconf
-
-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
}
-use_autoreconf yes
-autoreconf.args -fvi
+configure.cmd ./autogen.sh
-configure.args --enable-editor \
- --disable-schemas-compile \
+configure.args --disable-schemas-compile \
--disable-silent-rules
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
- system "${prefix}/bin/gio-querymodules ${prefix}/lib/gio/modules"
}
livecheck.type gnome
Added: users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/autogen.sh
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/autogen.sh (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/autogen.sh 2015-04-23 15:22:05 UTC (rev 135359)
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+olddir=`pwd`
+cd "$srcdir"
+
+if automake-1.11 --version > /dev/null 2>&1; then
+ automake_suffix='-1.11'
+else
+ automake_suffix=''
+fi
+
+mkdir -p m4 build-aux
+intltoolize --force
+aclocal${automake_suffix}
+autoheader
+automake${automake_suffix} --add-missing
+autoconf
+
+CFLAGS=${CFLAGS=-ggdb}
+LDFLAGS=${LDFLAGS=-Wl,-O1}
+export CFLAGS LDFLAGS
+
+cd "$olddir"
+
+if test -z "$NOCONFIGURE"; then
+ "$srcdir"/configure "$@"
+fi
Deleted: users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/patch-fix-lib-names-Makefile.am.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names-Makefile.am.diff 2015-03-20 15:11:06 UTC (rev 134246)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/patch-fix-lib-names-Makefile.am.diff 2015-04-23 15:22:05 UTC (rev 135359)
@@ -1,127 +0,0 @@
---- bin/Makefile.am.orig 2014-03-07 09:32:46.000000000 -0800
-+++ bin/Makefile.am 2014-03-07 09:37:25.000000000 -0800
-@@ -11,7 +11,7 @@
- -w
-
- dconf_LDADD = \
-- ../client/libdconf.so.1 \
-+ ../client/libdconf.1.dylib \
- $(gio_LIBS)
-
- dconf_SOURCES = \
---- client/Makefile.am.orig 2014-03-07 09:38:42.000000000 -0800
-+++ client/Makefile.am 2014-03-07 09:52:41.000000000 -0800
-@@ -1,20 +1,20 @@
- include $(top_srcdir)/Makefile.gtester
-
- shlibdir=$(libdir)
--shlib_PROGRAMS = libdconf.so.1.0.0
--nodist_noinst_DATA = libdconf.so.1 libdconf.so
-+shlib_PROGRAMS = libdconf.1.0.0.dylib
-+nodist_noinst_DATA = libdconf.1.dylib libdconf.dylib
- noinst_LIBRARIES = libdconf-client.a
-
--libdconf.so.1 libdconf.so: libdconf.so.1.0.0
-- $(AM_V_GEN) ln -fs libdconf.so.1.0.0 $@
-+libdconf.1.dylib libdconf.dylib: libdconf.1.0.0.dylib
-+ $(AM_V_GEN) ln -fs libdconf.1.0.0.dylib $@
-
- install-data-hook:
-- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.1
-- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
-+ ln -fs libdconf.1.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf.1.dylib
-+ ln -fs libdconf.1.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf.dylib
-
- uninstall-hook:
-- rm -f $(DESTDIR)$(shlibdir)/libdconf.so.1
-- rm -f $(DESTDIR)$(shlibdir)/libdconf.so
-+ rm -f $(DESTDIR)$(shlibdir)/libdconf.1.dylib
-+ rm -f $(DESTDIR)$(shlibdir)/libdconf.dylib
-
- dconfinclude_HEADERS = dconf.h
- dconfclientinclude_HEADERS = dconf-client.h
-@@ -24,16 +24,16 @@
- libdconf_client_a_SOURCES = \
- dconf-client.c
-
--libdconf_so_1_0_0_CFLAGS = $(libdconf_client_a_CFLAGS) -fPIC -DPIC
--libdconf_so_1_0_0_LDADD = \
-+libdconf_1_0_0_dylib_CFLAGS = $(libdconf_client_a_CFLAGS) -fPIC -DPIC
-+libdconf_1_0_0_dylib_LDADD = \
- ../engine/libdconf-engine-shared.a \
- ../common/libdconf-common-shared.a \
- ../gdbus/libdconf-gdbus-thread-shared.a \
- ../gvdb/libgvdb-shared.a \
- ../shm/libdconf-shm-shared.a \
- $(gio_LIBS)
--libdconf_so_1_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.1
--libdconf_so_1_0_0_SOURCES = $(libdconf_client_a_SOURCES)
-+libdconf_1_0_0_dylib_LDFLAGS = -dynamiclib -install_name ${libdir}/libdconf.1.0.0.dylib
-+libdconf_1_0_0_dylib_SOURCES = $(libdconf_client_a_SOURCES)
-
- EXTRA_DIST = dconf.vapi dconf.deps
-
-@@ -43,4 +43,4 @@
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = dconf.pc
-
--CLEANFILES = libdconf.so.1 libdconf.so
-+CLEANFILES = libdconf.1.dylib libdconf.dylib
---- dbus-1/Makefile.am.orig 2014-03-07 09:54:03.000000000 -0800
-+++ dbus-1/Makefile.am 2014-03-07 10:03:51.000000000 -0800
-@@ -17,10 +17,10 @@
- pkgconfig_DATA = dconf-dbus-1.pc
-
- shlibdir = $(libdir)
--shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0
-+shlib_PROGRAMS = libdconf-dbus-1.0.0.0.dylib
-
--libdconf_dbus_1_so_0_0_0_CFLAGS = $(dbus_CFLAGS) $(gio_CFLAGS) -fPIC -DPIC
--libdconf_dbus_1_so_0_0_0_LDADD = \
-+libdconf_dbus_1_0_0_0_dylib_CFLAGS = $(dbus_CFLAGS) $(gio_CFLAGS) -fPIC -DPIC
-+libdconf_dbus_1_0_0_0_dylib_LDADD = \
- ../engine/libdconf-engine-shared.a \
- ../common/libdconf-common-hidden.a \
- ./libdconf-libdbus-1-shared.a \
-@@ -28,20 +28,20 @@
- ../shm/libdconf-shm-shared.a \
- $(dbus_LIBS) \
- $(glib_LIBS)
--libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0
--libdconf_dbus_1_so_0_0_0_SOURCES = dconf-dbus-1.c
-+libdconf_dbus_1_0_0_0_dylib_LDFLAGS = -dynamiclib -install_name ${libdir}/libdconf-dbus-1.0.0.0.dylib
-+libdconf_dbus_1_0_0_0_dylib_SOURCES = dconf-dbus-1.c
-
--nodist_noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
-+nodist_noinst_DATA = libdconf-dbus-1.dylib libdconf-dbus-1.0.dylib
-
--libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0
-- $(AM_V_GEN) ln -fs libdconf-dbus-1.so.0.0.0 $@
-+libdconf-dbus-1.0.dylib libdconf-dbus-1.dylib: libdconf-dbus-1.0.0.0.dylib
-+ $(AM_V_GEN) ln -fs libdconf-dbus-1.0.0.0.dylib $@
-
- install-data-hook:
-- ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
-- ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
-+ ln -fs libdconf-dbus-1.0.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf-dbus-1.0.dylib
-+ ln -fs libdconf-dbus-1.0.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf-dbus-1.dylib
-
- uninstall-hook:
-- rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
-- rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
-+ rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.0.dylib
-+ rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.dylib
-
--CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
-+CLEANFILES = libdconf-dbus-1.0.dylib libdconf-dbus-1.dylib
---- editor/Makefile.am.orig 2014-03-07 10:04:58.000000000 -0800
-+++ editor/Makefile.am 2014-03-07 10:07:17.000000000 -0800
-@@ -7,7 +7,7 @@
- dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
-
- dconf_editor_LDADD = \
-- ../client/libdconf.so.1 \
-+ ../client/libdconf.1.dylib \
- $(gtk_LIBS) \
- $(gee_LIBS) \
- $(gmodule_LIBS) \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150423/38dbeac8/attachment-0001.html>
More information about the macports-changes
mailing list