[Lunar-commits] <moonbase-gnome> Merge branch 'master' of github.com:lunar-linux/moonbase-gnome

[Florin Braescu]

commit 147c5a86af8c1e0c466a8fac542e378bb14b02c0
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sat, 18 Aug 2012 22:08:22 -0700
URL: https://github.com/lunar-linux/moonbase-gnome/commit/147c5a86af8c1e0c466a8fac542e378bb14b02c0

Merge branch 'master' of github.com:lunar-linux/moonbase-gnome
---
  desktop/evince/BUILD        | +4/-0     
  desktop/evince/DEPENDS      | +3/-1     
  platform/dconf/BUILD        | +8/-0     
  platform/dconf/DEPENDS      | +14/-0    
  platform/dconf/DETAILS      | +15/-0    
  platform/dconf/POST_INSTALL | +4/-0     
  platform/gdk-pixbuf/DETAILS | +3/-3     
  7 files changed, 51 insertions(+), 4 deletions(-)

--- a/desktop/evince/BUILD
+++ b/desktop/evince/BUILD
@@ -6,8 +6,12 @@
   # Fixes segfault when closing
   patch_it $SOURCE3 1  &&
 
+  # Fixes linking problem with session management
+  sedit "s:\((SHELL_LIBS)\):\1 -lICE:" shell/Makefile.in &&
+
   OPTS+=" --enable-comics --enable-impress --enable-pixbuf"  &&
 
+  LIBS+="-lz" \
   default_build
 
 ) > $C_FIFO 2>&1
--- a/desktop/evince/DEPENDS
+++ b/desktop/evince/DEPENDS
@@ -2,7 +2,9 @@ depends  poppler
 depends  gnome-icon-theme
 depends  gnome-doc-utils
 #this should be optional, but currently doesn't compile without
-depends  GConf
+optional_depends  "GConf" \
+                  "--with-gconf" "--without-gconf" \
+                  "GConf support"
 
 optional_depends  "tiff"  \
                   "--enable-tiff"   \
--- /dev/null
+++ b/platform/dconf/BUILD
@@ -0,0 +1,8 @@
+(
+
+  # Only want glib-2 to own /usr/lib/gio/modules/giomodule.cache
+  sedit "s:dummy gio-querymodules:dummy echo:" configure &&
+
+  default_build
+
+) > $C_FIFO 2>&1
--- /dev/null
+++ b/platform/dconf/DEPENDS
@@ -0,0 +1,14 @@
+depends glib-2
+depends dbus
+
+# gtk+-3 is currently not officially supported by lunar
+#optional_depends "gtk+-3" "" "--disable-editor" "build dconf editor"
+
+# A disabling option is missing from dconf
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/dconf/files/dconf-0.5.1-automagic-vala.patch
+optional_depends vala "" "" "to compile .vala source files"
+
+optional_depends  "gtk-doc"            \
+                  "--enable-gtk-doc"   \
+                  "--disable-gtk-doc"  \
+                  "for building documentation"
--- /dev/null
+++ b/platform/dconf/DETAILS
@@ -0,0 +1,15 @@
+          MODULE=dconf
+         VERSION=0.12.1
+          SOURCE=$MODULE-$VERSION.tar.xz
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/${VERSION%.*}
+      SOURCE_VFY=sha1:1bdbf53b2e699fe58f69fa7a42164351e8560e05
+        WEB_SITE=http://live.gnome.org/dconf
+         ENTERED=20101128
+         UPDATED=20120818
+           SHORT="Simple low-level configuration system"
+
+cat << EOF
+dconf is a low-level configuration system. Its main purpose is to
+provide a back-end to GSettings on platforms that don't already have
+configuration storage systems.
+EOF
--- /dev/null
+++ b/platform/dconf/POST_INSTALL
@@ -0,0 +1,4 @@
+if [[ -x /usr/bin/gio-querymodules ]] ; then
+        # Recreate /usr/lib/gio/modules/giomodule.cache
+        gio-querymodules /usr/lib/gio/modules
+fi
--- a/platform/gdk-pixbuf/DETAILS
+++ b/platform/gdk-pixbuf/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gdk-pixbuf
            MAJOR=2.26
-         VERSION=$MAJOR.1
+         VERSION=$MAJOR.2
           SOURCE=$MODULE-$VERSION.tar.xz
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR
-      SOURCE_VFY=sha1:43e4fe5bd8d19bc7d7b853f71c85c193392cb2f7
+      SOURCE_VFY=sha1:9a9d4d693951718e4956d4f303ff0f667d3ccf8a
         WEB_SITE=http://live.gnome.org/GObjectIntrospection
          ENTERED=20091105
-         UPDATED=20120416
+         UPDATED=20120813
            SHORT="An image loading library used with GNOME"
 
 cat << EOF