Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31815/gnome
Modified Files:
acme.info acme.patch
Log Message:
New %v, clean for gcc4/intel
Index: acme.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/acme.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- acme.patch 20 Jan 2006 20:25:02 -0000 1.1
+++ acme.patch 24 Mar 2006 16:13:50 -0000 1.2
@@ -1,23 +1,89 @@
-diff -Naur acme-2.4.0-old/src/Makefile.in acme-2.4.0/src/Makefile.in
---- acme-2.4.0-old/src/Makefile.in Wed Sep 10 05:58:16 2003
-+++ acme-2.4.0/src/Makefile.in Thu Oct 30 12:11:52 2003
-@@ -136,7 +136,8 @@
- acme_LDFLAGS = \
- $(EXTRA_GNOME_LIBS) \
- $(ALSA_LIBS) \
-- $(INTLLIBS)
-+ $(INTLLIBS) \
-+ -lX11
+diff -Nurd -x'*~' acme-2.4.2.orig/src/Makefile.in acme-2.4.2/src/Makefile.in
+--- acme-2.4.2.orig/src/Makefile.in 2003-11-22 19:20:14.000000000 -0500
++++ acme-2.4.2/src/Makefile.in 2006-03-24 00:20:34.000000000 -0500
+@@ -527,13 +527,10 @@
+ eggtrayicon.h: regenerate-built-sources
+ eggtrayicon.c: regenerate-built-sources
+ regenerate-built-sources:
+- EGGFILES="$(EGGFILES1)" EGGDIR="$(EGGDIR1)"
$(srcdir)/update-from-egg.sh || true
+- EGGFILES="$(EGGFILES2)" EGGDIR="$(EGGDIR2)"
$(srcdir)/update-from-egg.sh || true
+ @INTLTOOL_SCHEMAS_RULE@
+ @INTLTOOL_DESKTOP_RULE@
+ install-data-local:
+- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL)
--makefile-install-rule $(srcdir)/$(schema_DATA)
- acme_properties_SOURCES = \
-@@ -156,7 +157,8 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -Nurd -x'*~' acme-2.4.2.orig/src/acme.c acme-2.4.2/src/acme.c
+--- acme-2.4.2.orig/src/acme.c 2003-11-22 19:17:57.000000000 -0500
++++ acme-2.4.2/src/acme.c 2006-03-23 23:54:55.000000000 -0500
+@@ -51,6 +51,10 @@
+ guint dialog_timeout;
+ WnckScreen *screen;
- acme_properties_LDFLAGS = \
- $(EXTRA_GNOME_LIBS) \
-- $(INTLLIBS)
-+ $(INTLLIBS) \
-+ -lX11
++ /* The Event */
++ GdkEvent *event;
++ GdkXEvent *xevent;
++
+ /* Multihead stuff */
+ GdkDisplay *display;
+ GdkScreen *current_screen;
+@@ -801,8 +805,14 @@
+ }
+ }
+
++ /* Since libwnck 2.6.2.1 you need to give a timestamp */
+ if (focused != NULL)
+- wnck_window_close (focused);
++ {
++ if (acme->event)
++ wnck_window_close (focused, acme->event->key.time);
++ else
++ wnck_window_close (focused, GDK_CURRENT_TIME);
++ }
+ }
+ static void
+@@ -1171,6 +1181,10 @@
+ GList *l;
+ int i;
+
++ /* Store the event */
++ acme->event = event;
++ acme->xevent = xevent;
++
+ /* Look for which screen we're receiving events */
+ for (l = acme->screens; (l != NULL) && (event_screen == NULL);
+ l = l->next)
+diff -Nurd -x'*~' acme-2.4.2.orig/src/eggcellrendererkeys.c
acme-2.4.2/src/eggcellrendererkeys.c
+--- acme-2.4.2.orig/src/eggcellrendererkeys.c 2003-07-17 19:12:02.000000000
-0400
++++ acme-2.4.2/src/eggcellrendererkeys.c 2006-03-24 00:12:43.000000000
-0500
+@@ -581,10 +581,9 @@
+ return GTK_CELL_EDITABLE (keys->edit_widget);
+ }
+
+-void
+-egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
+- guint keyval,
+- GdkModifierType mask)
++void egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
++ guint keyval,
++ EggVirtualModifierType mask)
+ {
+ char *text;
+ gboolean changed;
+@@ -623,10 +622,9 @@
+
+ }
+
+-void
+-egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
+- guint *keyval,
+- GdkModifierType *mask)
++void egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
++ guint *keyval,
++ EggVirtualModifierType *mask)
+ {
+ g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
- EXTRA_DIST = \
Index: acme.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/acme.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- acme.info 3 Feb 2006 16:41:50 -0000 1.2
+++ acme.info 24 Mar 2006 16:13:50 -0000 1.3
@@ -1,21 +1,16 @@
Package: acme
-Version: 2.4.1
-Revision: 1006
-Architecture: powerpc
-Depends: gnome-base, atk1-shlibs (>= 1.4.0-1), gconf2 (>= 2.4.0.1-1), gettext,
glib2 (>= 2.6.6-1111), gnome-vfs2 (>= 2.4.0-1) | gnome-vfs2-ssl (>= 2.4.0-1),
gtk+2 (>= 2.2.4-1), libart2-shlibs (>= 2.3.16-1), libbonobo2 (>= 2.4.0-1),
libbonoboui2 (>= 2.4.0-1), libglade2-shlibs (>= 2.0.1-13), libgnome2 (>=
2.4.0-1), libgnomecanvas2 (>= 2.4.0-1), libgnomeui2 (>= 2.4.0.1-1), libiconv,
libwnck1-shlibs (>= 2.4.0.1-1), libxml2-shlibs (>= 2.6.1-1), orbit2 (>=
2.8.1-1), pango1-xft2 (>= 1.2.5-1), popt-shlibs
-BuildDepends: glib2-dev (>= 2.6.6-1111), atk1 (>= 1.4.0-1), pango1-xft2-dev
(>= 1.2.5-1), gtk+2-dev (>= 2.2.4-1), libgnomecanvas2-dev (>= 2.4.0-1),
orbit2-dev (>= 2.8.1-1), gconf2-dev (>= 2.4.0.1-1), gnome-vfs2-dev (>= 2.4.0-1)
| gnome-vfs2-ssl-dev (>= 2.4.0-1), libxml2 (>= 2.6.1-1), libbonobo2-dev (>=
2.4.0-1), libgnome2-dev (>= 2.4.0-1), libbonoboui2-dev (>= 2.4.0-1),
libgnomeui2-dev (>= 2.4.0.1-1), pkgconfig, intltool, popt, gettext-dev,
gettext-bin, gettext-tools, libiconv-dev, libwnck1 (>= 2.4.0.1-1), libart2 (>=
2.3.16-1), gcc3.3, libglade2, startup-notification-dev
+Version: 2.4.2
+Revision: 1001
+Depends: gnome-base, atk1-shlibs (>= 1.4.0-1), gconf2 (>= 2.4.0.1-1),
glib2-shlibs (>= 2.6.6-1111), gnome-keyring-shlibs, gnome-vfs2-ssl-shlibs (>=
2.4.0-1) | gnome-vfs2-shlibs (>= 2.4.0-1), gtk+2 (>= 2.2.4-1), libart2-shlibs
(>= 2.3.16-1), libbonobo2 (>= 2.4.0-1), libbonoboui2 (>= 2.4.0-1),
libgettext3-shlibs, libglade2-shlibs (>= 2.0.1-13), libgnome2 (>= 2.4.0-1),
libgnomecanvas2 (>= 2.4.0-1), libgnomeui2 (>= 2.4.0.1-1), libiconv,
libwnck1.18-shlibs, libxml2-shlibs (>= 2.6.1-1), orbit2-shlibs (>= 2.8.1-1),
pango1-xft2-shlibs (>= 1.2.5-1), popt-shlibs, x11
+BuildDepends: pkgconfig, intltool, atk1 (>= 1.4.0-1), gconf2-dev (>=
2.4.0.1-1), glib2-dev (>= 2.6.6-1111), gnome-keyring-dev (>= 0.4.3-1),
gnome-vfs2-ssl-dev (>= 2.4.0-1) | gnome-vfs2-dev (>= 2.4.0-1), gtk+2-dev (>=
2.2.4-1), libart2 (>= 2.3.16-1), libbonobo2-dev (>= 2.4.0-1), libbonoboui2-dev
(>= 2.4.0-1), libgettext3-dev, gettext-bin, gettext-tools, libglade2 (>=
2.0.1-13), libgnome2-dev (>= 2.4.0-1), libgnomecanvas2-dev (>= 2.4.0-1),
libgnomeui2-dev (>= 2.4.0.1-1), libiconv-dev, libwnck1.18, libxml2 (>=
2.6.1-1), orbit2-dev (>= 2.8.1-1), pango1-xft2-dev (>= 1.2.5-1), popt, x11-dev
Source: mirror:gnome:sources/%n/2.4/%n-%v.tar.bz2
-Source-MD5: 0e4b240662a706d529757a86fe4bf0c5
+Source-MD5: 93c1f87530985c9a8b113e375e937d60
Patch: %n.patch
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
ConfigureParams: --libexecdir=%p/lib/%n --mandir=%p/share/man
-CompileScript: <<
- export CC=gcc-3.3; export CXX=g++-3.3; ./configure %c
- make CC=gcc-3.3 CXX=g++-3.3
-<<
InstallScript: <<
- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=%d
+ make install DESTDIR=%d
<<
PostInstScript: <<
if [ configure = "$1" ]; then
@@ -24,12 +19,24 @@
fi
<<
ConfFiles: %p/etc/gconf/schemas/acme.schemas
-DocFiles: AUTHORS COPYING ChangeLog README
+DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po NEWS README
Description: GNOME multimedia keyboard support
DescDetail: <<
ACME is a small GNOME tool to make use of the multimedia buttons
present on most laptops and internet keyboards.
<<
+DescPackaging: <<
+ Assume existing egg files are current so we don't have to import a
+ missing support script for src/Makefile.in
+
+ src/Makefile.am mis-implements --disable-schemas-install, so just
+ patch out the undesired behavior in src/Makefile.in
+<<
+DescPort: <<
+ Patch src/acme.c for new libwnck API (cvs.gnome r1.83->r1.84)
+
+ Patch src/eggcellrendererkeys.c for consistent types (cvs.gnome r1.6->r1.7)
+<<
License: GPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
