Author: qboosh Date: Mon Feb 28 07:35:00 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 0.7.2
---- Files affected:
SOURCES:
pinentry-system-assuan.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/pinentry-system-assuan.patch
diff -u SOURCES/pinentry-system-assuan.patch:1.2
SOURCES/pinentry-system-assuan.patch:1.3
--- SOURCES/pinentry-system-assuan.patch:1.2 Wed Dec 24 03:30:11 2003
+++ SOURCES/pinentry-system-assuan.patch Mon Feb 28 08:34:55 2005
@@ -31,30 +31,31 @@
$(LIBCAP) $(GTK_LIBS) $(libcurses)
pinentry_gtk_SOURCES = pinentry-gtk.c \
---- pinentry-0.7.0/qt/Makefile.am.orig 2003-12-23 09:39:00.000000000 +0100
-+++ pinentry-0.7.0/qt/Makefile.am 2003-12-24 02:54:32.645525240 +0100
-@@ -32,10 +32,10 @@
+--- pinentry-0.7.2/qt/Makefile.am.orig 2004-09-21 20:58:02.000000000 +0200
++++ pinentry-0.7.2/qt/Makefile.am 2005-02-28 08:18:37.063461672 +0100
+@@ -32,11 +32,11 @@
endif
--AM_CPPFLAGS = -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem $(QT_INCLUDES)
$(ncurses_include)
-+AM_CPPFLAGS = -I$(top_srcdir)/secmem $(QT_INCLUDES) $(ncurses_include)
+-AM_CPPFLAGS = -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem $(QT_INCLUDES)
$(ncurses_include) \
++AM_CPPFLAGS = -I$(top_srcdir)/secmem $(QT_INCLUDES) $(ncurses_include) \
+ -I$(top_srcdir)/pinentry
AM_CXXFLAGS = $(QT_CXXFLAGS)
pinentry_qt_LDADD = $(QT_LIBS) $(libcurses) ../pinentry/libpinentry.a \
- $(top_builddir)/assuan/libassuan.a \
+ -lassuan \
$(top_builddir)/secmem/libsecmem.a $(LIBCAP)
- pinentry_qt_LDFLAGS = $(QT_LDFLAGS)
+ pinentry_qt_LDFLAGS = $(QT_LDFLAGS) $(QT_RPATH)
---- pinentry-0.6.9/Makefile.am.orig Tue Dec 17 11:14:29 2002
-+++ pinentry-0.6.9/Makefile.am Thu Aug 21 10:49:12 2003
-@@ -39,7 +39,7 @@
- pinentry_qt =
+--- pinentry-0.7.2/Makefile.am.orig 2004-12-22 11:48:43.000000000 +0100
++++ pinentry-0.7.2/Makefile.am 2005-02-28 08:18:55.224700744 +0100
+@@ -53,7 +53,7 @@
+ pinentry_w32 =
endif
-SUBDIRS = assuan secmem pinentry ${pinentry_curses} \
+SUBDIRS = secmem pinentry ${pinentry_curses} \
- ${pinentry_gtk} ${pinentry_qt} doc
+ ${pinentry_gtk} ${pinentry_gtk_2} ${pinentry_qt} ${pinentry_w32} doc
signed-dist: $(distdir).tar.gz.sig
--- pinentry-0.7.0/pinentry/pinentry.c.orig 2003-12-22 19:28:07.000000000
+0100
@@ -76,3 +77,14 @@
table[i].name, table[i].handler);
if (rc)
return rc;
+--- pinentry-0.7.2/gtk+-2/Makefile.am.orig 2005-01-27 09:10:22.000000000
+0100
++++ pinentry-0.7.2/gtk+-2/Makefile.am 2005-02-28 08:19:40.426828976 +0100
+@@ -31,7 +31,7 @@
+
+ AM_CPPFLAGS = $(GTK2CFLAGS) $(ncurses_include) \
+ -I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
+-LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a
\
++LDADD = ../pinentry/libpinentry.a -lassuan ../secmem/libsecmem.a \
+ $(LIBCAP) $(GTK2LIBS) $(libcurses)
+
+ pinentry_gtk_2_SOURCES = pinentry-gtk-2.c \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/pinentry-system-assuan.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
