[patch] gyachi.patch

gyachi.patch (text/plain), 4.01 KB, created by Keith Neuse on 2006-11-15 17:44:29 UTC

diff -ur gyachi2/plugins/Makefile.am files/plugins/Makefile.am
--- gyachi2/plugins/Makefile.am	2006-07-24 15:25:14.000000000 -0500
+++ files/plugins/Makefile.am	2006-11-12 07:54:02.000000000 -0600
@@ -3,7 +3,6 @@
     gyachimcrypt.so \
     gyachiblowfish.so \
     gyachigpgme.so \
-    gyachixmms.so
 
 
 plugindir = $(pkgdatadir)/plugins
@@ -24,10 +23,6 @@
 gyachigpgme_so_LDADD = @GTK_LIBS@ -lgpgme
 gyachigpgme_so_LDFLAGS = -shared -fpic -fPIC
 
-gyachixmms_so_SOURCES = gyachi-xmms.c
-gyachixmms_so_LDADD = @GTK_LIBS@ -lxmms
-gyachixmms_so_LDFLAGS = -shared -fpic -fPIC -Xlinker -Bdynamic -Wl,--export-dynamic
-
 # Required for localization
 localedir = $(datadir)/locale
 
diff -ur gyachi2/plugins/Makefile.in files/plugins/Makefile.in
--- gyachi2/plugins/Makefile.in	2006-08-23 14:16:33.000000000 -0500
+++ files/plugins/Makefile.in	2006-11-12 07:54:47.000000000 -0600
@@ -37,8 +37,7 @@
 build_triplet = @build@
 host_triplet = @host@
 plugin_PROGRAMS = gyachiphotos.so$(EXEEXT) gyachimcrypt.so$(EXEEXT) \
-	gyachiblowfish.so$(EXEEXT) gyachigpgme.so$(EXEEXT) \
-	gyachixmms.so$(EXEEXT)
+	gyachiblowfish.so$(EXEEXT) gyachigpgme.so$(EXEEXT)
 subdir = plugins
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -63,9 +62,6 @@
 am_gyachiphotos_so_OBJECTS = gyachi-photos.$(OBJEXT)
 gyachiphotos_so_OBJECTS = $(am_gyachiphotos_so_OBJECTS)
 gyachiphotos_so_DEPENDENCIES =
-am_gyachixmms_so_OBJECTS = gyachi-xmms.$(OBJEXT)
-gyachixmms_so_OBJECTS = $(am_gyachixmms_so_OBJECTS)
-gyachixmms_so_DEPENDENCIES =
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -78,11 +74,9 @@
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(gyachiblowfish_so_SOURCES) $(gyachigpgme_so_SOURCES) \
-	$(gyachimcrypt_so_SOURCES) $(gyachiphotos_so_SOURCES) \
-	$(gyachixmms_so_SOURCES)
+	$(gyachimcrypt_so_SOURCES) $(gyachiphotos_so_SOURCES)
 DIST_SOURCES = $(gyachiblowfish_so_SOURCES) $(gyachigpgme_so_SOURCES) \
-	$(gyachimcrypt_so_SOURCES) $(gyachiphotos_so_SOURCES) \
-	$(gyachixmms_so_SOURCES)
+	$(gyachimcrypt_so_SOURCES) $(gyachiphotos_so_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -255,9 +249,6 @@
 gyachigpgme_so_SOURCES = gyachi-gpgme.c
 gyachigpgme_so_LDADD = @GTK_LIBS@ -lgpgme
 gyachigpgme_so_LDFLAGS = -shared -fpic -fPIC
-gyachixmms_so_SOURCES = gyachi-xmms.c
-gyachixmms_so_LDADD = @GTK_LIBS@ -lxmms
-gyachixmms_so_LDFLAGS = -shared -fpic -fPIC -Xlinker -Bdynamic -Wl,--export-dynamic
 
 # Required for localization
 localedir = $(datadir)/locale
@@ -335,9 +326,6 @@
 gyachiphotos.so$(EXEEXT): $(gyachiphotos_so_OBJECTS) $(gyachiphotos_so_DEPENDENCIES) 
 	@rm -f gyachiphotos.so$(EXEEXT)
 	$(LINK) $(gyachiphotos_so_LDFLAGS) $(gyachiphotos_so_OBJECTS) $(gyachiphotos_so_LDADD) $(LIBS)
-gyachixmms.so$(EXEEXT): $(gyachixmms_so_OBJECTS) $(gyachixmms_so_DEPENDENCIES) 
-	@rm -f gyachixmms.so$(EXEEXT)
-	$(LINK) $(gyachixmms_so_LDFLAGS) $(gyachixmms_so_OBJECTS) $(gyachixmms_so_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -349,7 +337,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gyachi-gpgme.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gyachi-mcrypt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gyachi-photos.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gyachi-xmms.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
Only in gyachi/plugins: Makefile.in~
diff -ur gyachi2/plugins/gyachi-gpgme.c files/plugins/gyachi-gpgme.c
--- gyachi2/plugins/gyachi-gpgme.c	2006-03-26 14:34:20.000000000 -0600
+++ files/plugins/gyachi-gpgme.c	2006-11-12 07:53:43.000000000 -0600
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #include "plugin_api.h"
-#include <gpgme.h>
+#include <gpgme/gpgme.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>