[svn] r5741 - in trunk/rpms: ghex inkscape loudmouth muttprint
pinentry syck
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Fri Aug 17 13:13:57 CEST 2007
Author: dries
Date: 2007-08-17 13:13:55 +0200 (Fri, 17 Aug 2007)
New Revision: 5741
Added:
trunk/rpms/ghex/ghex-no-scrollkeeper.patch
trunk/rpms/ghex/ghex-search-crash.patch
trunk/rpms/inkscape/inkscape-0.44.1-psinput.patch
trunk/rpms/inkscape/inkscape-0.45-python.patch
trunk/rpms/loudmouth/loudmouth-1.2.2-stream-error.patch
trunk/rpms/muttprint/muttprint-0.72d-css.patch
trunk/rpms/pinentry/pinentry-0.7.2-info.patch
trunk/rpms/syck/syck-0.55-libtool.patch
Log:
add
Added: trunk/rpms/ghex/ghex-no-scrollkeeper.patch
===================================================================
--- trunk/rpms/ghex/ghex-no-scrollkeeper.patch (rev 0)
+++ trunk/rpms/ghex/ghex-no-scrollkeeper.patch 2007-08-17 11:13:55 UTC (rev 5741)
@@ -0,0 +1,18 @@
+diff -Naur ghex-2.8.2.org/omf-install/Makefile.in ghex-2.8.2/omf-install/Makefile.in
+--- ghex-2.8.2.org/omf-install/Makefile.in 2006-07-15 16:05:45.000000000 +0200
++++ ghex-2.8.2/omf-install/Makefile.in 2006-07-15 16:06:14.000000000 +0200
+@@ -374,14 +374,12 @@
+ -for file in $(srcdir)/*.omf; do \
+ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
+ done
+- -scrollkeeper-update -p $(localstatedir)/scrollkeeper
+
+ uninstall-local:
+ -for file in $(srcdir)/*.omf; do \
+ basefile=`basename $$file`; \
+ rm -f $(omf_dest_dir)/$$basefile; \
+ done
+- -scrollkeeper-update -p $(localstatedir)/scrollkeeper
+ # 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.
+ .NOEXPORT:
Added: trunk/rpms/ghex/ghex-search-crash.patch
===================================================================
--- trunk/rpms/ghex/ghex-search-crash.patch (rev 0)
+++ trunk/rpms/ghex/ghex-search-crash.patch 2007-08-17 11:13:55 UTC (rev 5741)
@@ -0,0 +1,11 @@
+--- src/gtkhex.c
++++ src/gtkhex.c
+@@ -2290,7 +2290,7 @@
+ gint len,
+ const gchar *colour)
+ {
+- GtkHex_AutoHighlight *new = g_malloc0(sizeof(GtkHex_Highlight));
++ GtkHex_AutoHighlight *new = g_malloc0(sizeof(GtkHex_AutoHighlight));
+
+ new->search_string = g_memdup(search, len);
+ new->search_len = len;
Added: trunk/rpms/inkscape/inkscape-0.44.1-psinput.patch
===================================================================
--- trunk/rpms/inkscape/inkscape-0.44.1-psinput.patch (rev 0)
+++ trunk/rpms/inkscape/inkscape-0.44.1-psinput.patch 2007-08-17 11:13:55 UTC (rev 5741)
@@ -0,0 +1,42 @@
+--- inkscape-0.44.1/share/extensions/ps_input.inx.orig 2006-12-06 11:47:27.000000000 +0100
++++ inkscape-0.44.1/share/extensions/ps_input.inx 2006-12-06 11:46:40.000000000 +0100
+@@ -1,7 +1,6 @@
+ <inkscape-extension>
+ <_name>Postscript Input</_name>
+ <id>org.inkscape.input.ps</id>
+- <dependency type="extension">org.inkscape.input.sk</dependency>
+ <dependency type="executable">pstoedit</dependency>
+ <input>
+ <extension>.ps</extension>
+@@ -11,7 +10,6 @@
+ <output_extension>org.inkscape.output.ps</output_extension>
+ </input>
+ <script>
+- <command reldir="path">pstoedit -f sk</command>
+- <helper_extension>org.inkscape.input.sk</helper_extension>
++ <command reldir="path">pstoedit -ndt -f plot-svg</command>
+ </script>
+ </inkscape-extension>
+--- inkscape-0.44.1/share/extensions/eps_input.inx.orig 2006-12-06 12:19:56.000000000 +0100
++++ inkscape-0.44.1/share/extensions/eps_input.inx 2006-12-06 12:19:42.000000000 +0100
+@@ -1,9 +1,8 @@
+ <inkscape-extension>
+ <_name>EPS Input</_name>
+ <id>org.inkscape.input.eps</id>
+- <dependency type="extension">org.inkscape.input.ps</dependency>
+- <dependency type="executable">gs</dependency>
+- <input>
++ <dependency type="executable">pstoedit</dependency>
++ <input>
+ <extension>.eps</extension>
+ <mimetype>image/x-encapsulated-postscript</mimetype>
+ <_filetypename>Encapsulated Postscript (*.eps)</_filetypename>
+@@ -11,7 +10,6 @@
+ <output_extension>org.inkscape.output.eps</output_extension>
+ </input>
+ <script>
+- <command reldir="path">gs -q -sDEVICE=pswrite -sOutputFile=- -dNOPAUSE -dBATCH -dSAFER -dDEVICEWIDTH=250000 -dDEVICEHEIGHT=250000</command>
+- <helper_extension>org.inkscape.input.ps</helper_extension>
++ <command reldir="path">pstoedit -ndt -f plot-svg</command>
+ </script>
+ </inkscape-extension>
Added: trunk/rpms/inkscape/inkscape-0.45-python.patch
===================================================================
--- trunk/rpms/inkscape/inkscape-0.45-python.patch (rev 0)
+++ trunk/rpms/inkscape/inkscape-0.45-python.patch 2007-08-17 11:13:55 UTC (rev 5741)
@@ -0,0 +1,36 @@
+--- inkscape-0.45/configure.orig 2007-02-07 12:08:44.000000000 -0800
++++ inkscape-0.45/configure 2007-02-07 12:22:34.000000000 -0800
+@@ -10769,7 +10769,7 @@
+ if test "$?" -gt "0"; then
+ with_python="no"
+ else
+- checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
++ checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('DBLIB'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
+ if test "$?" -gt "0"; then
+ with_python="no"
+ else
+--- inkscape-0.45/src/extension/script/inkscape_py_wrap.cpp.orig 2007-02-07 17:11:42.000000000 -0800
++++ inkscape-0.45/src/extension/script/inkscape_py_wrap.cpp 2007-02-07 18:19:21.000000000 -0800
+@@ -802,7 +802,7 @@
+ obj = pyobj;
+ if (PyCFunction_Check(obj)) {
+ /* here we get the method pointer for callbacks */
+- char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
++ const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
+ c = doc ? strstr(doc, "swig_ptr: ") : 0;
+ if (c) {
+ c += 10;
+@@ -977,11 +977,11 @@
+ swig_type_info **types_initial) {
+ int i;
+ for (i = 0; methods[i].ml_name; ++i) {
+- char *c = methods[i].ml_doc;
++ const char *c = methods[i].ml_doc;
+ if (c && (c = strstr(c, "swig_ptr: "))) {
+ int j;
+ swig_const_info *ci = 0;
+- char *name = c + 10;
++ const char *name = c + 10;
+ for (j = 0; const_table[j].type; j++) {
+ if (strncmp(const_table[j].name, name,
+ strlen(const_table[j].name)) == 0) {
Added: trunk/rpms/loudmouth/loudmouth-1.2.2-stream-error.patch
===================================================================
--- trunk/rpms/loudmouth/loudmouth-1.2.2-stream-error.patch (rev 0)
+++ trunk/rpms/loudmouth/loudmouth-1.2.2-stream-error.patch 2007-08-17 11:13:55 UTC (rev 5741)
@@ -0,0 +1,49 @@
+--- loudmouth-1.2.2/loudmouth/lm-connection.c.stream-error 2007-05-16 13:15:21.000000000 -0400
++++ loudmouth-1.2.2/loudmouth/lm-connection.c 2007-05-16 13:17:58.000000000 -0400
+@@ -285,7 +285,7 @@
+ }
+ else if (lm_message_get_type (m) == LM_MESSAGE_TYPE_STREAM_ERROR) {
+ connection_stream_error (connection, m);
+- goto out;
++ goto run_global_handlers;
+ }
+
+ id = lm_message_node_get_attribute (m->node, "id");
+@@ -304,6 +304,7 @@
+ goto out;
+ }
+
++run_global_handlers:
+ for (l = connection->handlers[lm_message_get_type (m)];
+ l && result == LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
+ l = l->next) {
+@@ -1461,7 +1462,7 @@
+ static void
+ connection_stream_error (LmConnection *connection, LmMessage *m)
+ {
+- LmMessageNode *node;
++ LmMessageNode *node, *child;
+
+ g_return_if_fail (connection != NULL);
+ g_return_if_fail (m != NULL);
+@@ -1469,16 +1470,16 @@
+ node = m->node;
+
+ /* Resource conflict */
+- node = lm_message_node_get_child (node, "conflict");
+- if (node) {
++ child = lm_message_node_get_child (node, "conflict");
++ if (child) {
+ lm_verbose ("Stream error: Conflict (resource connected elsewhere)\n");
+ connection->disconnect_reason = LM_DISCONNECT_REASON_RESOURCE_CONFLICT;
+ return;
+ }
+
+ /* XML is crack */
+- node = lm_message_node_get_child (node, "xml-not-well-formed");
+- if (node) {
++ child = lm_message_node_get_child (node, "xml-not-well-formed");
++ if (child) {
+ lm_verbose ("Stream error: XML not well formed\n");
+ connection->disconnect_reason = LM_DISCONNECT_REASON_INVALID_XML;
+ return;
Added: trunk/rpms/muttprint/muttprint-0.72d-css.patch
===================================================================
--- trunk/rpms/muttprint/muttprint-0.72d-css.patch (rev 0)
+++ trunk/rpms/muttprint/muttprint-0.72d-css.patch 2007-08-17 11:13:55 UTC (rev 5741)
@@ -0,0 +1,55 @@
+--- doc/manual/de/Makefile.orig 2007-05-04 19:40:56.000000000 +0200
++++ doc/manual/de/Makefile 2007-05-04 19:41:06.000000000 +0200
+@@ -91,7 +91,7 @@
+ mkdir -p $(docdir)/$(docdirname)/manual-$(lang)
+ # ignore the stylesheet-images/ directory because the files are not needed
+ $(INSTALL) manual-$(lang)/*.html $(docdir)/$(docdirname)/manual-$(lang)/
+- $(INSTALL) manual-$(lang)/*.css $(docdir)/$(docdirname)/manual-$(lang)/
++# $(INSTALL) manual-$(lang)/*.css $(docdir)/$(docdirname)/manual-$(lang)/
+
+ gzip:
+ $(gzip) *.ps *.txt
+--- doc/manual/en/Makefile.orig 2007-05-04 19:40:56.000000000 +0200
++++ doc/manual/en/Makefile 2007-05-04 19:41:06.000000000 +0200
+@@ -91,7 +91,7 @@
+ mkdir -p $(docdir)/$(docdirname)/manual-$(lang)
+ # ignore the stylesheet-images/ directory because the files are not needed
+ $(INSTALL) manual-$(lang)/*.html $(docdir)/$(docdirname)/manual-$(lang)/
+- $(INSTALL) manual-$(lang)/*.css $(docdir)/$(docdirname)/manual-$(lang)/
++# $(INSTALL) manual-$(lang)/*.css $(docdir)/$(docdirname)/manual-$(lang)/
+
+ gzip:
+ $(gzip) *.ps *.txt
+--- doc/manual/es/Makefile.orig 2007-05-04 19:40:56.000000000 +0200
++++ doc/manual/es/Makefile 2007-05-04 19:41:06.000000000 +0200
+@@ -91,7 +91,7 @@
+ mkdir -p $(docdir)/$(docdirname)/manual-$(lang)
+ # ignore the stylesheet-images/ directory because the files are not needed
+ $(INSTALL) manual-$(lang)/*.html $(docdir)/$(docdirname)/manual-$(lang)/
+- $(INSTALL) manual-$(lang)/*.css $(docdir)/$(docdirname)/manual-$(lang)/
++# $(INSTALL) manual-$(lang)/*.css $(docdir)/$(docdirname)/manual-$(lang)/
+
+ gzip:
+ $(gzip) *.ps *.txt
+--- doc/manual/it/Makefile.orig 2007-05-04 19:40:56.000000000 +0200
++++ doc/manual/it/Makefile 2007-05-04 19:41:06.000000000 +0200
+@@ -91,7 +91,7 @@
+ mkdir -p $(docdir)/$(docdirname)/manual-$(lang)
+ # ignore the stylesheet-images/ directory because the files are not needed
+ $(INSTALL) manual-$(lang)/*.html $(docdir)/$(docdirname)/manual-$(lang)/
+- $(INSTALL) manual-$(lang)/*.css $(docdir)/$(docdirname)/manual-$(lang)/
++# $(INSTALL) manual-$(lang)/*.css $(docdir)/$(docdirname)/manual-$(lang)/
+
+ gzip:
+ $(gzip) *.ps *.txt
+--- doc/manual/sl/Makefile.orig 2007-05-04 19:40:56.000000000 +0200
++++ doc/manual/sl/Makefile 2007-05-04 19:41:06.000000000 +0200
+@@ -91,7 +91,7 @@
+ mkdir -p $(docdir)/$(docdirname)/manual-$(lang)
+ # ignore the stylesheet-images/ directory because the files are not needed
+ $(INSTALL) manual-$(lang)/*.html $(docdir)/$(docdirname)/manual-$(lang)/
+- $(INSTALL) manual-$(lang)/*.css $(docdir)/$(docdirname)/manual-$(lang)/
++# $(INSTALL) manual-$(lang)/*.css $(docdir)/$(docdirname)/manual-$(lang)/
+
+ gzip:
+ $(gzip) *.ps *.txt
Added: trunk/rpms/pinentry/pinentry-0.7.2-info.patch
===================================================================
--- trunk/rpms/pinentry/pinentry-0.7.2-info.patch (rev 0)
+++ trunk/rpms/pinentry/pinentry-0.7.2-info.patch 2007-08-17 11:13:55 UTC (rev 5741)
@@ -0,0 +1,22 @@
+--- pinentry-0.7.2/doc/pinentry.texi~ 2005-01-27 09:58:03.000000000 +0200
++++ pinentry-0.7.2/doc/pinentry.texi 2005-10-18 21:03:51.000000000 +0300
+@@ -62,7 +62,7 @@
+ @ifnottex
+ @dircategory GNU Utilities
+ @direntry
+-* pinentry:: Ask securely for a passphrase or PIN.
++* pinentry: (pinentry). Ask securely for a passphrase or PIN.
+ @end direntry
+ This file documents the use and the internals of the @pinentry{}.
+
+--- pinentry-0.7.2/doc/pinentry.info~ 2005-01-27 10:06:25.000000000 +0200
++++ pinentry-0.7.2/doc/pinentry.info 2005-10-18 21:04:11.000000000 +0300
+@@ -3,7 +3,7 @@
+
+ INFO-DIR-SECTION GNU Utilities
+ START-INFO-DIR-ENTRY
+-* pinentry:: Ask securely for a passphrase or PIN.
++* pinentry: (pinentry). Ask securely for a passphrase or PIN.
+ END-INFO-DIR-ENTRY
+ This file documents the use and the internals of the PINENTRY.
+
Added: trunk/rpms/syck/syck-0.55-libtool.patch
===================================================================
--- trunk/rpms/syck/syck-0.55-libtool.patch (rev 0)
+++ trunk/rpms/syck/syck-0.55-libtool.patch 2007-08-17 11:13:55 UTC (rev 5741)
@@ -0,0 +1,57 @@
+--- syck-0.55/ext/php/make_module.sh.bak 2005-08-24 16:02:05.000000000 -0700
++++ syck-0.55/ext/php/make_module.sh 2005-08-24 16:09:19.000000000 -0700
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+ phpize
+-./configure --with-syck
++CFLAGS='-L../../lib/.libs -I../../lib' ./configure --with-syck=../../lib/.libs
+ make
+ make install
+--- syck-0.55/ext/python/setup.py.bak 2005-08-24 15:54:34.000000000 -0700
++++ syck-0.55/ext/python/setup.py 2005-08-24 15:55:12.000000000 -0700
+@@ -3,7 +3,7 @@
+ syck = Extension('syck',
+ include_dirs = ['/usr/local/include','../../lib'],
+ libraries = ['syck'],
+- library_dirs = ['/usr/local/lib','../../lib'],
++ library_dirs = ['/usr/local/lib','../../lib/.libs'],
+ sources = ['pyext.c'])
+
+ setup (name = 'Syck',
+--- syck-0.55/lib/Makefile.am.bak 2005-08-24 15:37:27.000000000 -0700
++++ syck-0.55/lib/Makefile.am 2005-08-24 15:45:55.000000000 -0700
+@@ -4,10 +4,10 @@
+
+ AM_YFLAGS = -d -t -v -p syck
+
+-lib_LIBRARIES = libsyck.a
++lib_LTLIBRARIES = libsyck.la
+ include_HEADERS = syck.h syck_st.h
+
+-libsyck_a_SOURCES = \
++libsyck_la_SOURCES = \
+ emitter.c \
+ handler.c \
+ node.c \
+@@ -19,6 +19,11 @@
+ token.re \
+ implicit.re
+
++# CURRENT:REVISION:AGE
++# Bump REVISION if there's no API or ABI changes.
++# Bump AGE and CURRENT and reset REVISION if there's no ABI changes.
++# Bump CURRENT and reset AGE and REVISION if there's ABI changes.
++libsyck_la_LDFLAGS = -version-info 0:55:0
+ # libsyck_a_LIBADD = $(LEXLIB)
+
+ REC = re2c
+--- syck-0.55/configure.in.bak 2005-08-24 15:37:00.000000000 -0700
++++ syck-0.55/configure.in 2005-08-24 15:50:42.000000000 -0700
+@@ -7,6 +7,7 @@
+ AM_CONFIG_HEADER(config.h)
+
+ # Checks for programs.
++AC_PROG_LIBTOOL
+ AC_PROG_CC_STDC
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
More information about the svn-commits
mailing list