Update of /cvsroot/fink/experimental/dmacks/finkinfo/gnome-2.28
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9157

Added Files:
        gnome-settings-daemon.info gnome-settings-daemon.patch 
Log Message:
new version


--- NEW FILE: gnome-settings-daemon.info ---
Package: gnome-settings-daemon
Version: 2.28.1
Revision: 1
Depends: <<
        atk1-shlibs (>= 1.28.0-1),
        cairo-shlibs (>= 1.8.8-1),
        dbus (>= 1.2.1-1),
        dbus-glib1.2-shlibs,
        dbus1.3-shlibs,
        dpkg-base-files,
        fontconfig2-shlibs (>= 2.8.0-1),
        freetype219-shlibs (>= 2.3.12-1),
        gconf2 (>= 2.28.0-1),
        gconf2-shlibs (>= 2.28.0-1),
        glib2-shlibs (>= 2.22.0-1),
        gnome-desktop2.11-shlibs (>= 2.28.0-1),
        gtk+2-shlibs (>= 2.18.0-1),
        libgettext8-shlibs,
        libgnomekbd2-4-shlibs,
        libxklavier16-shlibs,
        libxml2-shlibs (>= 2.6.30-1),
        pango1-xft2-ft219-shlibs (>= 1.24.5-4),
        startup-notification-shlibs (>= 0.9-1),
        x11,
        xdg-base
<<

BuildDepends: <<
        atk1 (>= 1.28.0-1),
        cairo (>= 1.8.8-1),
        dbus-glib1.2-dev,
        dbus1.3-dev,
        fink (>= 0.24.12-1),
        fink-package-precedence,
        fontconfig2-dev (>= 2.8.0-1),
        freetype219 (>= 2.3.12-1),
        gconf2-dev (>= 2.28.0-1),
        gettext-bin,
        gettext-tools,
        glib2-dev (>= 2.22.0-1),
        glitz,
        gnome-desktop2.11-dev (>= 2.28.0-1),
        gtk+2-dev (>= 2.18.0-1),
        intltool40,
        libgettext8-dev,
        libgnomekbd2-4-dev,
        libxklavier16,
        libxml2 (>= 2.6.30-1),
        pkgconfig (>= 0.23),
        pango1-xft2-ft219-dev (>= 1.24.5-4),
        pixman (>= 0.16.0-1),
        startup-notification-dev (>= 0.9-1),
        x11-dev
<<
Replaces: control-center
Source: mirror:gnome:sources/%n/2.28/%n-%v.tar.bz2
Source-MD5: cadb2e161846c4df76fec45679db1f50
PatchFile: %n.patch
PatchFile-MD5: bd18c76aa5bac8ff9da890717fcec284
PatchScript: <<
        %{default_script}
        perl -pi -e 's,xrandr,,' plugins/Makefile.in
        perl -pi -e 's,(XListInputDevices),${1}_FORCE_NONDETECT,' configure
        perl -pi -e 's/(glib-2.0) (>= \$GLIB_REQUIRED_VERSION)/\1 \2 
gthread-2.0 \2/g' configure
<<
SetCPPFLAGS: -I%p/lib/fontconfig2/include
SetLDFLAGS: -L%p/lib/fontconfig2/lib
SetCFLAGS: -Os -pipe
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
ConfigureParams: --enable-dependency-tracking --libexecdir=%p/lib/%n 
--disable-static --disable-schemas-install 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH" 
--without-libnotify
CompileScript: <<
        ./configure %c
        make
        fink-package-precedence --prohibit-bdep %n-dev . || exit 2
<<
InstallScript: <<
        ac_cv_lib_Xrandr_XRRUpdateConfiguration=no make install DESTDIR=%d
<<
DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po MAINTAINERS NEWS 
README

ConfFiles: <<
        %p/etc/gconf/schemas/apps_gnome_settings_daemon_housekeeping.schemas 
        %p/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
        %p/etc/gconf/schemas/apps_gnome_settings_daemon_xrandr.schemas 
        %p/etc/gconf/schemas/desktop_gnome_font_rendering.schemas
        %p/etc/gconf/schemas/desktop_gnome_keybindings.schemas
        %p/etc/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas 
        %p/etc/gconf/schemas/gnome-settings-daemon.schemas
<<
PostInstScript: <<
        if [ configure = "$1" ]; then
                export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
                for s in \
                        apps_gnome_settings_daemon_housekeeping \
                        apps_gnome_settings_daemon_keybindings \
                        apps_gnome_settings_daemon_xrandr \
                        desktop_gnome_font_rendering \
                        desktop_gnome_keybindings \
                        desktop_gnome_peripherals_touchpad \
                        gnome-settings-daemon \
                ; do
                        gconftool-2 --makefile-install-rule 
%p/etc/gconf/schemas/$s.schemas >/dev/null
                done
        fi
<<
SplitOff: <<
        Package: %N-dev
        Depends: <<
                %N (>= %v-%r)
        <<
        Replaces: control-center2-dev, control-center
        BuildDependsOnly: true
        Files: <<
                include
                lib/pkgconfig
        <<
        DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po 
MAINTAINERS NEWS README
<<
DescPort: <<
          Add missing libX11 link to plugins. See:
          http://bugzilla.gnome.org/show_bug.cgi?id=585311

          Disable detection of XInput because it's too old. See:
          http://bugzilla.gnome.org/show_bug.cgi?id=585315

        And make sure not to try to use xinput. See:
        https://bugzilla.gnome.org/show_bug.cgi?id=611670

        Recent glib doesn't publish -lintl, so pass it directly.

        Uses gthread directly, so must link it directly. See:
        https://bugzilla.gnome.org/show_bug.cgi?id=608217

        Update to new libxklavier API. Patch from:
        
http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=70c902628f7d9e757b88445b1bfb3841e88ff2f9
<<
DescPackaging: <<
        This is a separate package as of 2.21ish, spawned from the
        control-center suite.

        Ignore libnotify to avoid notification-daemon and its
        gstreamer dep tree

        Disable xrandr because it's disabled in the dependent
        gnome-desktop pkg.

        Doesn't have shared-lib, but does allow building of compiled
        plugins and client-apps using public .pc and .h, so putting
        them in a -dev pkg.

        Not fixing autostart issue pending upstream response. See:
        http://bugzilla.gnome.org/show_bug.cgi?id=590055
<<
Description: Preferences & settings management
DescUsage: <<
You may need to start the daemon manually first before your gnome
theme and other settings will be used. Run:

  %p/lib/gnome-settings-daemon/gnome-settings-daemon

from a shell prompt or add it to your .xinitrc or x11 window-manager
startup items.

You can ignore warnings about missing X extensions (they are not
available in some x11 server versions).

You can ignore "upable to open" xmodmap errors (really only a warning
that gnome-applets did not install an expected data file because the
file is broken and would not provide known improvements over the
defaults).

Some touchpad features are disabled.
<<
License: GPL
Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
Homepage: http://www.gnome.org/

--- NEW FILE: gnome-settings-daemon.patch ---
diff -Nurd -x'*~' gnome-settings-daemon-2.28.1.orig/configure 
gnome-settings-daemon-2.28.1/configure
--- gnome-settings-daemon-2.28.1.orig/configure 2009-10-19 10:04:26.000000000 
-0400
+++ gnome-settings-daemon-2.28.1/configure      2010-03-02 22:48:32.000000000 
-0500
@@ -18703,6 +18703,8 @@
 $as_echo "yes" >&6; }
        :
 fi
+SETTINGS_PLUGIN_CFLAGS="$SETTINGS_PLUGIN_CFLAGS ${X_CFLAGS}"
+SETTINGS_PLUGIN_LIBS="${SETTINGS_PLUGIN_LIBS} ${X_LIBS} -lX11 -L/usr/X11R6/lib 
-lintl"
 
 GSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined"
 case $host_os in
diff -Nurd -x'*~' 
gnome-settings-daemon-2.28.1.orig/gnome-settings-daemon/Makefile.in 
gnome-settings-daemon-2.28.1/gnome-settings-daemon/Makefile.in
--- gnome-settings-daemon-2.28.1.orig/gnome-settings-daemon/Makefile.in 
2009-10-19 10:04:27.000000000 -0400
+++ gnome-settings-daemon-2.28.1/gnome-settings-daemon/Makefile.in      
2010-03-02 22:48:32.000000000 -0500
@@ -359,7 +359,7 @@
 
 gnome_settings_daemon_LDADD = \
        libgsd-profile.la               \
-       $(SETTINGS_DAEMON_LIBS)
+       $(SETTINGS_DAEMON_LIBS) -lintl
 
 EXTRA_DIST = \
        $(Dbusapi_DATA)                 \
diff -Nurd -x'*~' 
gnome-settings-daemon-2.28.1.orig/plugins/keyboard/gsd-keyboard-xkb.c 
gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c
--- gnome-settings-daemon-2.28.1.orig/plugins/keyboard/gsd-keyboard-xkb.c       
2009-10-19 09:50:55.000000000 -0400
+++ gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c    
2010-03-03 00:10:48.000000000 -0500
@@ -526,7 +526,9 @@
        if (!inited_ok)
                return;
 
-       xkl_engine_stop_listen (xkl_engine);
+       xkl_engine_stop_listen (xkl_engine,
+                               XKLL_MANAGE_LAYOUTS |
+                               XKLL_MANAGE_WINDOW_STATES);
 
        gdk_window_remove_filter (NULL,
                                  (GdkFilterFunc)
diff -Nurd -x'*~' 
gnome-settings-daemon-2.28.1.orig/plugins/mouse/gsd-mouse-manager.c 
gnome-settings-daemon-2.28.1/plugins/mouse/gsd-mouse-manager.c
--- gnome-settings-daemon-2.28.1.orig/plugins/mouse/gsd-mouse-manager.c 
2009-09-21 06:24:02.000000000 -0400
+++ gnome-settings-daemon-2.28.1/plugins/mouse/gsd-mouse-manager.c      
2010-03-03 00:58:19.000000000 -0500
@@ -84,7 +84,9 @@
 static void     gsd_mouse_manager_init        (GsdMouseManager      
*mouse_manager);
 static void     gsd_mouse_manager_finalize    (GObject             *object);
 static void     set_mouse_settings            (GsdMouseManager      *manager);
+#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
 static XDevice* device_is_touchpad            (XDeviceInfo deviceinfo);
+#endif
 
 G_DEFINE_TYPE (GsdMouseManager, gsd_mouse_manager, G_TYPE_OBJECT)
 
@@ -460,6 +462,7 @@
                                0, 0, motion_threshold);
 }
 
+#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
 static XDevice*
 device_is_touchpad (XDeviceInfo deviceinfo)
 {
@@ -494,6 +497,7 @@
         XCloseDevice (GDK_DISPLAY (), device);
         return NULL;
 }
+#endif
 
 static int
 set_disable_w_typing (GsdMouseManager *manager, gboolean state)
@@ -539,6 +543,7 @@
         return 0;
 }
 
+#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
 static int
 set_tap_to_click (gboolean state)
 {
@@ -716,6 +721,7 @@
         XFreeDeviceList (devicelist);
         return 0;
 }
+#endif
 
 static void
 set_locate_pointer (GsdMouseManager *manager,
@@ -818,9 +824,11 @@
         set_motion_threshold (manager, gconf_client_get_int (client, 
KEY_MOTION_THRESHOLD, NULL));
 
         set_disable_w_typing (manager, gconf_client_get_bool (client, 
KEY_TOUCHPAD_DISABLE_W_TYPING, NULL));
+#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
         set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, 
NULL));
         set_edge_scroll (gconf_client_get_int (client, KEY_SCROLL_METHOD, 
NULL));
         set_horiz_scroll (gconf_client_get_bool (client, KEY_PAD_HORIZ_SCROLL, 
NULL));
+#endif
 
         g_object_unref (client);
 }
@@ -846,6 +854,7 @@
         } else if (! strcmp (entry->key, KEY_TOUCHPAD_DISABLE_W_TYPING)) {
                 if (entry->value->type == GCONF_VALUE_BOOL)
                         set_disable_w_typing (manager, gconf_value_get_bool 
(entry->value));
+#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
         } else if (! strcmp (entry->key, KEY_TAP_TO_CLICK)) {
                 if (entry->value->type == GCONF_VALUE_BOOL)
                         set_tap_to_click (gconf_value_get_bool (entry->value));
@@ -857,6 +866,7 @@
         } else if (! strcmp (entry->key, KEY_PAD_HORIZ_SCROLL)) {
                 if (entry->value->type == GCONF_VALUE_BOOL)
                         set_horiz_scroll (gconf_value_get_bool (entry->value));
+#endif
         } else if (! strcmp (entry->key, KEY_LOCATE_POINTER)) {
                 if (entry->value->type == GCONF_VALUE_BOOL) {
                         set_locate_pointer (manager, gconf_value_get_bool 
(entry->value));
@@ -928,9 +938,11 @@
                                 gconf_client_get_bool (client, 
KEY_DELAY_ENABLE, NULL));
 
         set_disable_w_typing (manager, gconf_client_get_bool (client, 
KEY_TOUCHPAD_DISABLE_W_TYPING, NULL));
+#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
         set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, 
NULL));
         set_edge_scroll (gconf_client_get_int (client, KEY_SCROLL_METHOD, 
NULL));
         set_horiz_scroll (gconf_client_get_bool (client, KEY_PAD_HORIZ_SCROLL, 
NULL));
+#endif
 
         g_object_unref (client);
 


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to