| 1 |
loki_val 08/11/26 15:37:51 |
| 2 |
|
| 3 |
Added: last-exit-notify-sharp.patch |
| 4 |
Log: |
| 5 |
Fix bug 248892. Also add patch to build against system notify-sharp. Add deps permissive of gtk-sharp-2.12.6. |
| 6 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-sound/last-exit/files/last-exit-notify-sharp.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/last-exit/files/last-exit-notify-sharp.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/last-exit/files/last-exit-notify-sharp.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: last-exit-notify-sharp.patch |
| 15 |
=================================================================== |
| 16 |
--- trunk/configure.ac 2008/03/21 16:15:50 167 |
| 17 |
+++ trunk/configure.ac 2008/03/26 08:08:52 168 |
| 18 |
@@ -50,6 +50,13 @@ |
| 19 |
fi |
| 20 |
AM_CONDITIONAL(EXTERNAL_DBUS, test "x$have_external_dbus" = "xyes") |
| 21 |
|
| 22 |
+PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp, have_external_notify_sharp="yes", have_external_notify_sharp="no") |
| 23 |
+if test "x$have_external_notify_sharp" != "xyes"; then |
| 24 |
+ AC_MSG_RESULT([using internal copy]) |
| 25 |
+fi |
| 26 |
+AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, test "x$have_external_notify_sharp" = "xyes") |
| 27 |
+ |
| 28 |
+ |
| 29 |
AC_PATH_PROG(MCS, gmcs) |
| 30 |
if test x$MCS = x; then |
| 31 |
AC_MSG_ERROR(You need mcs) |
| 32 |
--- trunk/src/Makefile.am 2008/03/21 16:15:50 167 |
| 33 |
+++ trunk/src/Makefile.am 2008/03/26 08:08:52 168 |
| 34 |
@@ -72,8 +72,12 @@ |
| 35 |
XMLRPC_ASSEMBLIES = \ |
| 36 |
-r:${DIR_XMLRPC}/XmlRpcCS.dll |
| 37 |
|
| 38 |
+if EXTERNAL_NOTIFY_SHARP |
| 39 |
+NOTIFY_ASSEMBLIES = $(NOTIFY_SHARP_LIBS) |
| 40 |
+else |
| 41 |
NOTIFY_ASSEMBLIES = \ |
| 42 |
-r:$(DIR_NOTIFY)/notify-sharp.dll |
| 43 |
+endif |
| 44 |
|
| 45 |
LASTEXIT_RESOURCES = \ |
| 46 |
-resource:$(top_srcdir)/data/glade/FindStation.glade \ |
| 47 |
--- trunk/notify-sharp/Makefile.am 2008/03/21 16:15:50 167 |
| 48 |
+++ trunk/notify-sharp/Makefile.am 2008/03/26 08:08:52 168 |
| 49 |
@@ -1,13 +1,13 @@ |
| 50 |
NOTIFY_ASSEMBLY = notify-sharp.dll |
| 51 |
+NOTIFY_SRC = \ |
| 52 |
+ $(srcdir)/Global.cs \ |
| 53 |
+ $(srcdir)/Notification.cs |
| 54 |
|
| 55 |
+if !EXTERNAL_NOTIFY_SHARP |
| 56 |
notifydir = $(pkglibdir) |
| 57 |
notify_SCRIPTS = \ |
| 58 |
$(NOTIFY_ASSEMBLY) |
| 59 |
|
| 60 |
-NOTIFY_SRC = \ |
| 61 |
- $(srcdir)/Global.cs \ |
| 62 |
- $(srcdir)/Notification.cs |
| 63 |
- |
| 64 |
if EXTERNAL_DBUS |
| 65 |
DBUS_ASSEMBLIES = $(DBUS_LIBS) |
| 66 |
else |
| 67 |
@@ -21,6 +21,8 @@ |
| 68 |
$(NOTIFY_ASSEMBLY): $(NOTIFY_SRC) |
| 69 |
$(MCS) -target:library -out:$@ $(DBUS_ASSEMBLIES) $(GTKSHARP_LIBS) $(NOTIFY_SRC) |
| 70 |
|
| 71 |
+endif |
| 72 |
+ |
| 73 |
EXTRA_DIST = $(NOTIFY_SRC) |
| 74 |
DISTCLEANFILES = $(NOTIFY_ASSEMBLY) $(NOTIFY_ASSEMBLY).mdb |
| 75 |
MAINTAINERCLEANFILES = Makefile.in |
Archives