François Andriot
11 years ago
parent
1af57210e2
commit
cdec7ede2c
@ -0,0 +1,11 @@
|
||||
--- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113 2013-06-26 22:35:42.000000000 +0200
|
||||
+++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh 2013-08-29 22:27:18.546349736 +0200
|
||||
@@ -123,7 +123,7 @@
|
||||
fi
|
||||
|
||||
echo "*** Creating Makefile templates"
|
||||
-$AUTOMAKE || exit 1
|
||||
+$AUTOMAKE --add-missing || exit 1
|
||||
|
||||
if test "$UNSERMAKE" = no; then
|
||||
echo "*** Postprocessing Makefile templates"
|
||||
@ -0,0 +1,11 @@
|
||||
--- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113 2013-06-26 22:35:42.000000000 +0200
|
||||
+++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh 2013-08-29 22:27:18.546349736 +0200
|
||||
@@ -123,7 +123,7 @@
|
||||
fi
|
||||
|
||||
echo "*** Creating Makefile templates"
|
||||
-$AUTOMAKE || exit 1
|
||||
+$AUTOMAKE --add-missing || exit 1
|
||||
|
||||
if test "$UNSERMAKE" = no; then
|
||||
echo "*** Postprocessing Makefile templates"
|
||||
@ -0,0 +1,15 @@
|
||||
--- trinity-koffice-3.5.13.2/lib/kross/configure.in.in.ori 2013-08-24 20:57:39.878623151 +0200
|
||||
+++ trinity-koffice-3.5.13.2/lib/kross/configure.in.in 2013-08-24 20:58:50.132123615 +0200
|
||||
@@ -42,6 +42,12 @@
|
||||
fi
|
||||
fi
|
||||
if test -z "$RUBY_VERSION"; then
|
||||
+ RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null`
|
||||
+ if test -n "$RUBY_VERSION"; then
|
||||
+ RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags`
|
||||
+ fi
|
||||
+ fi
|
||||
+ if test -z "$RUBY_VERSION"; then
|
||||
# pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
|
||||
if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
|
||||
# rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1
|
||||
@ -0,0 +1,33 @@
|
||||
--- trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp.ORI 2013-07-29 11:26:26.740982531 +0200
|
||||
+++ trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp 2013-07-29 11:26:53.970250335 +0200
|
||||
@@ -143,10 +143,10 @@
|
||||
*/
|
||||
|
||||
static const TQString
|
||||
- html_form_begin("\n<form action=\"apt:/\" method=\"GET\">\n"
|
||||
+ html_form_begin_apt("\n<form action=\"apt:/\" method=\"GET\">\n"
|
||||
"<table class=\"query\">\n");
|
||||
static const TQString
|
||||
- html_form_end("<tr>\n"
|
||||
+ html_form_end_apt("<tr>\n"
|
||||
"\t<td class=\"button\" colspan=\"2\"><input type=\"submit\" value=\"%1\"></td>\n"
|
||||
"</tr>\n"
|
||||
"</table>\n"
|
||||
@@ -197,7 +197,7 @@
|
||||
if (online)
|
||||
stream << "<table class=\"queryform\"><tr><td>\n";
|
||||
|
||||
- stream << html_form_begin;
|
||||
+ stream << html_form_begin_apt;
|
||||
stream << "<tr><td colspan=\"2\" class=\"title\">" + i18n("Offline search") + "</td></tr>" << endl;
|
||||
stream << make_html_form_line("search", i18n("Package search"));
|
||||
if (ext_form)
|
||||
@@ -206,7 +206,7 @@
|
||||
stream << make_html_form_line("fsearch", i18n("File search"));
|
||||
stream << make_html_form_line("show", i18n("Package info"));
|
||||
}
|
||||
- stream << html_form_end.arg( i18n("Search") );
|
||||
+ stream << html_form_end_apt.arg( i18n("Search") );
|
||||
|
||||
if (online)
|
||||
{
|
||||
@ -0,0 +1,114 @@
|
||||
--- trinity-libksquirrel-3.5.13.2/kernel/kls_gif/fmt_codec_gif.cpp.giflib5 2013-06-07 20:05:31.000000000 +0200
|
||||
+++ trinity-libksquirrel-3.5.13.2/kernel/kls_gif/fmt_codec_gif.cpp 2013-08-24 17:58:13.978555540 +0200
|
||||
@@ -43,14 +43,26 @@
|
||||
/* libgif 4.2.0 has retired PrintGifError() and added GifErrorString() */
|
||||
#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \
|
||||
((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4)
|
||||
+#if GIFLIB_MAJOR > 4
|
||||
+static void PrintGifError(int ErrorCode)
|
||||
+#else
|
||||
static void PrintGifError(void)
|
||||
+#endif
|
||||
{
|
||||
+#if GIFLIB_MAJOR > 4
|
||||
+ char *Err = GifErrorString(ErrorCode);
|
||||
+#else
|
||||
char *Err = GifErrorString();
|
||||
+#endif
|
||||
|
||||
if (Err != NULL) {
|
||||
fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
|
||||
} else {
|
||||
+#if GIFLIB_MAJOR > 4
|
||||
+ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", ErrorCode);
|
||||
+#else
|
||||
fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -107,7 +119,12 @@
|
||||
buf = 0;
|
||||
saved = 0;
|
||||
|
||||
+#if GIFLIB_MAJOR > 4
|
||||
+ int ErrorCode;
|
||||
+ gif = DGifOpenFileName(file.c_str(), &ErrorCode);
|
||||
+#else
|
||||
gif = DGifOpenFileName(file.c_str());
|
||||
+#endif
|
||||
|
||||
// for safety...
|
||||
if(!gif)
|
||||
@@ -198,7 +215,11 @@
|
||||
{
|
||||
if (DGifGetRecordType(gif, &record) == GIF_ERROR)
|
||||
{
|
||||
+#if GIFLIB_MAJOR > 4
|
||||
+ PrintGifError(gif->Error);
|
||||
+#else
|
||||
PrintGifError();
|
||||
+#endif
|
||||
return SQE_R_BADFILE;
|
||||
}
|
||||
|
||||
@@ -207,7 +228,11 @@
|
||||
case IMAGE_DESC_RECORD_TYPE:
|
||||
if(DGifGetImageDesc(gif) == GIF_ERROR)
|
||||
{
|
||||
+#if GIFLIB_MAJOR > 4
|
||||
+ PrintGifError(gif->Error);
|
||||
+#else
|
||||
PrintGifError();
|
||||
+#endif
|
||||
return SQE_R_BADFILE;
|
||||
}
|
||||
|
||||
@@ -243,7 +268,11 @@
|
||||
case EXTENSION_RECORD_TYPE:
|
||||
if(DGifGetExtension(gif, &ExtCode, &Extension) == GIF_ERROR)
|
||||
{
|
||||
+#if GIFLIB_MAJOR > 4
|
||||
+ PrintGifError(gif->Error);
|
||||
+#else
|
||||
PrintGifError();
|
||||
+#endif
|
||||
return SQE_R_BADFILE;
|
||||
}
|
||||
|
||||
@@ -287,7 +316,11 @@
|
||||
{
|
||||
if(DGifGetExtensionNext(gif, &Extension) == GIF_ERROR)
|
||||
{
|
||||
+#if GIFLIB_MAJOR > 4
|
||||
+ PrintGifError(gif->Error);
|
||||
+#else
|
||||
PrintGifError();
|
||||
+#endif
|
||||
return SQE_R_BADFILE;
|
||||
}
|
||||
}
|
||||
@@ -366,7 +399,11 @@
|
||||
{
|
||||
if(DGifGetLine(gif, buf, Width) == GIF_ERROR)
|
||||
{
|
||||
+#if GIFLIB_MAJOR > 4
|
||||
+ PrintGifError(gif->Error);
|
||||
+#else
|
||||
PrintGifError();
|
||||
+#endif
|
||||
memset(scan, 255, im->w * sizeof(RGBA));
|
||||
return SQE_R_BADFILE;
|
||||
}
|
||||
@@ -439,7 +476,11 @@
|
||||
if(DGifGetLine(gif, buf, Width) == GIF_ERROR)
|
||||
{
|
||||
memset(scan, 255, im->w * sizeof(RGBA));
|
||||
+#if GIFLIB_MAJOR > 4
|
||||
+ PrintGifError(gif->Error);
|
||||
+#else
|
||||
PrintGifError();
|
||||
+#endif
|
||||
return SQE_R_BADFILE;
|
||||
}
|
||||
else
|
||||
@ -0,0 +1,11 @@
|
||||
--- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113 2013-06-26 22:35:42.000000000 +0200
|
||||
+++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh 2013-08-29 22:27:18.546349736 +0200
|
||||
@@ -123,7 +123,7 @@
|
||||
fi
|
||||
|
||||
echo "*** Creating Makefile templates"
|
||||
-$AUTOMAKE || exit 1
|
||||
+$AUTOMAKE --add-missing || exit 1
|
||||
|
||||
if test "$UNSERMAKE" = no; then
|
||||
echo "*** Postprocessing Makefile templates"
|
||||
@ -0,0 +1,30 @@
|
||||
--- ./qtruby/rubylib/qtruby/configure.in.in.ruby2 2013-08-24 15:44:24.933359206 +0200
|
||||
+++ ./qtruby/rubylib/qtruby/configure.in.in 2013-08-24 15:49:41.820696908 +0200
|
||||
@@ -21,6 +21,12 @@
|
||||
fi
|
||||
fi
|
||||
if test -z "$RUBY_VERSION"; then
|
||||
+ RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null`
|
||||
+ if test -n "$RUBY_VERSION"; then
|
||||
+ RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags`
|
||||
+ fi
|
||||
+ fi
|
||||
+ if test -z "$RUBY_VERSION"; then
|
||||
# pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
|
||||
if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
|
||||
# rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1
|
||||
--- ./korundum/rubylib/korundum/configure.in.in.ruby2 2013-08-24 15:44:24.933359206 +0200
|
||||
+++ ./korundum/rubylib/korundum/configure.in.in 2013-08-24 15:50:46.666333349 +0200
|
||||
@@ -19,6 +19,12 @@
|
||||
if test -n "$RUBY_VERSION"; then
|
||||
RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags`
|
||||
fi
|
||||
+ fi
|
||||
+ if test -z "$RUBY_VERSION"; then
|
||||
+ RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null`
|
||||
+ if test -n "$RUBY_VERSION"; then
|
||||
+ RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags`
|
||||
+ fi
|
||||
fi
|
||||
if test -z "$RUBY_VERSION"; then
|
||||
# pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
|
||||
Loading…
Reference in new issue