| 1 |
compnerd 08/01/06 03:28:55 |
| 2 |
|
| 3 |
Added: gsynaptics-0.9.13-no-libgnome.patch |
| 4 |
gsynaptics-0.9.13-CoastingSpeedThreshold.patch |
| 5 |
digest-gsynaptics-0.9.13-r1 |
| 6 |
Removed: digest-gsynaptics-0.9.13 |
| 7 |
Log: |
| 8 |
add patch from Frittella Laurento for change in synaptics driver (bug #202501) and a patch to drop the libgnome dependency |
| 9 |
(Portage version: 2.1.4_rc14) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 gnome-extra/gsynaptics/files/gsynaptics-0.9.13-no-libgnome.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gsynaptics/files/gsynaptics-0.9.13-no-libgnome.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gsynaptics/files/gsynaptics-0.9.13-no-libgnome.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: gsynaptics-0.9.13-no-libgnome.patch |
| 18 |
=================================================================== |
| 19 |
diff -burNp gsynaptics-0.9.13/configure.ac gsynaptics-0.9.13/configure.ac |
| 20 |
--- gsynaptics-0.9.13/configure.ac 2007-11-28 16:12:02.000000000 -0800 |
| 21 |
+++ gsynaptics-0.9.13/configure.ac 2007-12-23 21:26:00.000000000 -0800 |
| 22 |
@@ -18,14 +18,14 @@ AC_PROG_CC |
| 23 |
# Checks for libraries. |
| 24 |
AM_PATH_GTK_2_0(2.6.0) |
| 25 |
|
| 26 |
-PKG_CHECK_MODULES(GNOME, libgnomeui-2.0) |
| 27 |
-AC_SUBST(GNOME_CFLAGS) |
| 28 |
-AC_SUBST(GNOME_LIBS) |
| 29 |
- |
| 30 |
PKG_CHECK_MODULES(GLADE2, libglade-2.0) |
| 31 |
AC_SUBST(GLADE2_CFLAGS) |
| 32 |
AC_SUBST(GLADE2_LIBS) |
| 33 |
|
| 34 |
+PKG_CHECK_MODULES(GCONF2, gconf-2.0) |
| 35 |
+AC_SUBST(GCONF2_CFLAGS) |
| 36 |
+AC_SUBST(GCONF2_LIBS) |
| 37 |
+ |
| 38 |
GETTEXT_PACKAGE=gsynaptics |
| 39 |
AC_SUBST(GETTEXT_PACKAGE) |
| 40 |
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package]) |
| 41 |
diff -burNp gsynaptics-0.9.13/src/init.c gsynaptics-0.9.13/src/init.c |
| 42 |
--- gsynaptics-0.9.13/src/init.c 2007-10-29 00:37:23.000000000 -0700 |
| 43 |
+++ gsynaptics-0.9.13/src/init.c 2007-12-23 21:31:30.000000000 -0800 |
| 44 |
@@ -22,7 +22,7 @@ |
| 45 |
# include <config.h> |
| 46 |
#endif |
| 47 |
|
| 48 |
-#include <gnome.h> |
| 49 |
+#include <glib/gi18n.h> |
| 50 |
#include <gconf/gconf-client.h> |
| 51 |
|
| 52 |
#include "gsynaptics.h" |
| 53 |
@@ -91,10 +91,7 @@ main (int argc, char **argv) |
| 54 |
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); |
| 55 |
textdomain (GETTEXT_PACKAGE); |
| 56 |
|
| 57 |
- gnome_program_init ("gsynaptics-init", VERSION, |
| 58 |
- LIBGNOMEUI_MODULE, argc, argv, |
| 59 |
- GNOME_PARAM_APP_DATADIR, NULL, |
| 60 |
- NULL); |
| 61 |
+ gtk_init (&argc, &argv); |
| 62 |
|
| 63 |
synaptics = g_synaptics_new (); |
| 64 |
|
| 65 |
diff -burNp gsynaptics-0.9.13/src/main.c gsynaptics-0.9.13/src/main.c |
| 66 |
--- gsynaptics-0.9.13/src/main.c 2007-11-28 16:09:08.000000000 -0800 |
| 67 |
+++ gsynaptics-0.9.13/src/main.c 2007-12-23 21:28:36.000000000 -0800 |
| 68 |
@@ -22,7 +22,7 @@ |
| 69 |
# include <config.h> |
| 70 |
#endif |
| 71 |
|
| 72 |
-#include <gnome.h> |
| 73 |
+#include <glib/gi18n.h> |
| 74 |
#include <glade/glade.h> |
| 75 |
#include <gconf/gconf-client.h> |
| 76 |
|
| 77 |
@@ -683,7 +683,7 @@ setup_dialog (GladeXML *dialog) |
| 78 |
|
| 79 |
gtk_window_set_default_size (GTK_WINDOW (widget), 400, -1); |
| 80 |
|
| 81 |
- path = gnome_pixmap_file ("touchpad.png"); |
| 82 |
+ path = g_build_filename (DATADIR "/pixmaps", "touchpad.png"); |
| 83 |
if (path) |
| 84 |
{ |
| 85 |
icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL); |
| 86 |
@@ -712,10 +712,7 @@ main (int argc, char **argv) |
| 87 |
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); |
| 88 |
textdomain (GETTEXT_PACKAGE); |
| 89 |
|
| 90 |
- gnome_program_init ("gsynaptics", VERSION, |
| 91 |
- LIBGNOMEUI_MODULE, argc, argv, |
| 92 |
- GNOME_PARAM_APP_DATADIR, DATADIR, |
| 93 |
- NULL); |
| 94 |
+ gtk_init (&argc, &argv); |
| 95 |
|
| 96 |
synaptics = g_synaptics_new (); |
| 97 |
if (!g_synaptics_is_available(synaptics)) |
| 98 |
diff -burNp gsynaptics-0.9.13/src/Makefile.am gsynaptics-0.9.13/src/Makefile.am |
| 99 |
--- gsynaptics-0.9.13/src/Makefile.am 2007-10-29 00:37:23.000000000 -0700 |
| 100 |
+++ gsynaptics-0.9.13/src/Makefile.am 2007-12-23 21:31:53.000000000 -0800 |
| 101 |
@@ -3,8 +3,8 @@ gsynaptics_CFLAGS = \ |
| 102 |
-DDATADIR=\""$(datadir)/$(PACKAGE)"\" \ |
| 103 |
-DHELPDATADIR=\""$(datadir)"\" \ |
| 104 |
$(GTK_CFLAGS) \ |
| 105 |
- $(GNOME_CFLAGS) \ |
| 106 |
$(GLADE2_CFLAGS) \ |
| 107 |
+ $(GCONF2_CFLAGS) \ |
| 108 |
$(AM_CFLAGS) |
| 109 |
|
| 110 |
gsynaptics_SOURCES = \ |
| 111 |
@@ -15,8 +15,8 @@ gsynaptics_SOURCES = \ |
| 112 |
|
| 113 |
gsynaptics_LDADD = \ |
| 114 |
$(GTK_LIBS) \ |
| 115 |
- $(GNOME_LIBS) \ |
| 116 |
- $(GLADE2_LIBS) |
| 117 |
+ $(GLADE2_LIBS) \ |
| 118 |
+ $(GCONF2_LIBS) |
| 119 |
|
| 120 |
gsynaptics_init_SOURCES = \ |
| 121 |
gsynaptics-conf.h \ |
| 122 |
@@ -25,11 +25,14 @@ gsynaptics_init_SOURCES = \ |
| 123 |
gsynaptics.c gsynaptics.h |
| 124 |
|
| 125 |
gsynaptics_init_CFLAGS = \ |
| 126 |
+ $(GTK_CFLAGS) \ |
| 127 |
$(GLIB_CFLAGS) \ |
| 128 |
$(GNOME_CFLAGS) \ |
| 129 |
+ $(GCONF2_CFLAGS) \ |
| 130 |
$(AM_CFLAGS) |
| 131 |
|
| 132 |
gsynaptics_init_LDADD = \ |
| 133 |
+ $(GTK_LIBS) \ |
| 134 |
$(GLIB_LIBS) \ |
| 135 |
- $(GNOME_LIBS) |
| 136 |
- |
| 137 |
+ $(GNOME_LIBS) \ |
| 138 |
+ $(GCONF2_LIBS) |
| 139 |
|
| 140 |
|
| 141 |
|
| 142 |
1.1 gnome-extra/gsynaptics/files/gsynaptics-0.9.13-CoastingSpeedThreshold.patch |
| 143 |
|
| 144 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gsynaptics/files/gsynaptics-0.9.13-CoastingSpeedThreshold.patch?rev=1.1&view=markup |
| 145 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gsynaptics/files/gsynaptics-0.9.13-CoastingSpeedThreshold.patch?rev=1.1&content-type=text/plain |
| 146 |
|
| 147 |
Index: gsynaptics-0.9.13-CoastingSpeedThreshold.patch |
| 148 |
=================================================================== |
| 149 |
--- src/gsynaptics.c.orig 2008-01-04 14:45:16.721550130 +0100 |
| 150 |
+++ src/gsynaptics.c 2008-01-04 14:45:47.666549605 +0100 |
| 151 |
@@ -821,7 +821,7 @@ |
| 152 |
if (priv->synclient) |
| 153 |
{ |
| 154 |
gchar *command; |
| 155 |
- command = g_strdup_printf ("synclient CoastingSpeedThreshold=%f", |
| 156 |
+ command = g_strdup_printf ("synclient CoastingSpeed=%f", |
| 157 |
thresh); |
| 158 |
g_spawn_command_line_async (command, NULL); |
| 159 |
g_free (command); |
| 160 |
|
| 161 |
|
| 162 |
|
| 163 |
1.1 gnome-extra/gsynaptics/files/digest-gsynaptics-0.9.13-r1 |
| 164 |
|
| 165 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gsynaptics/files/digest-gsynaptics-0.9.13-r1?rev=1.1&view=markup |
| 166 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gsynaptics/files/digest-gsynaptics-0.9.13-r1?rev=1.1&content-type=text/plain |
| 167 |
|
| 168 |
Index: digest-gsynaptics-0.9.13-r1 |
| 169 |
=================================================================== |
| 170 |
MD5 3b6f2698500de6d8f75d6d3f5b02c402 gsynaptics-0.9.13.tar.gz 410684 |
| 171 |
RMD160 128c8f6360466823e8d80205e2429939db854d3e gsynaptics-0.9.13.tar.gz 410684 |
| 172 |
SHA256 a76727d86896b7ddb297d8eb74167fccfd9590158727a1754499c2682edf9edc gsynaptics-0.9.13.tar.gz 410684 |
| 173 |
|
| 174 |
|
| 175 |
|
| 176 |
-- |
| 177 |
gentoo-commits@l.g.o mailing list |
Archives