rev 10020 - people/raul/kvirc/debian/patches
Raúl Sánchez Siles
kebianizao-guest at alioth.debian.org
Sun Apr 6 17:03:21 UTC 2008
Author: kebianizao-guest
Date: 2008-04-06 17:03:21 +0000 (Sun, 06 Apr 2008)
New Revision: 10020
Modified:
people/raul/kvirc/debian/patches/01_rpath.patch.noauto_apply
people/raul/kvirc/debian/patches/03_eula.patch
people/raul/kvirc/debian/patches/04_buildlog.patch.noauto_apply
people/raul/kvirc/debian/patches/08_gcc4fix.patch.noauto_apply
people/raul/kvirc/debian/patches/09_plugin_dir.patch
Log:
Updated patches.
Modified: people/raul/kvirc/debian/patches/01_rpath.patch.noauto_apply
===================================================================
--- people/raul/kvirc/debian/patches/01_rpath.patch.noauto_apply 2008-04-06 17:03:18 UTC (rev 10019)
+++ people/raul/kvirc/debian/patches/01_rpath.patch.noauto_apply 2008-04-06 17:03:21 UTC (rev 10020)
@@ -1,44 +1,49 @@
---- admin/acinclude.m4.in.orig 2005-02-23 17:10:48.111742600 -0500
-+++ admin/acinclude.m4.in 2005-02-23 17:11:56.567335768 -0500
-@@ -1015,7 +1015,7 @@
+--- admin/acinclude.m4.in 2008-03-22 03:05:25.000000000 +0100
++++ admin/acinclude.m4.in.2 2008-03-30 18:39:06.000000000 +0200
+@@ -1105,7 +1105,7 @@
ss_save_LIBS="$LIBS"
- CPPFLAGS="-I$SS_X_INCDIR -I$SS_QT_INCDIR -I$SS_KDE_INCDIR $CPPFLAGS $X_CFLAGS"
+ CPPFLAGS="-I$SS_X_INCDIR -I$SS_QT3_INCDIR -I$SS_KDE_INCDIR $CPPFLAGS $X_CFLAGS"
CXXFLAGS="-O2 -Wall $CXXFLAGS"
-- LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT_LIBDIR $LIBS -lsoundserver_idl -lkdecore -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR"
-+ LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT_LIBDIR $LIBS -lsoundserver_idl -lkdecore -l$SS_QTLIB_NAME"
+- LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -lkdecore -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR"
++ LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -lkdecore -l$SS_QTLIB_NAME"
if test "$SS_LINK_TO_LIBDL" = "yes"; then
LIBS="$LIBS -ldl";
fi
-@@ -1864,7 +1864,7 @@
+@@ -2252,7 +2252,7 @@
if test -n "$SS_X_LIBLINK"; then
LIBS="$LIBS $SS_X_LIBLINK"
fi
-- LIBS="-L$SS_KDE_LIBDIR -L$SS_QT_LIBDIR -lkdecore -l$SS_QTLIB_NAME $LIBS -Wl,-rpath $SS_KDE_LIBDIR"
-+ LIBS="-L$SS_KDE_LIBDIR -L$SS_QT_LIBDIR -lkdecore -l$SS_QTLIB_NAME $LIBS"
+- LIBS="-L$SS_KDE_LIBDIR -L$SS_QT3_LIBDIR -lkdecore -l$SS_QTLIB_NAME $LIBS -Wl,-rpath $SS_KDE_LIBDIR"
++ LIBS="-L$SS_KDE_LIBDIR -L$SS_QT3_LIBDIR -lkdecore -l$SS_QTLIB_NAME $LIBS"
if test "$SS_LINK_TO_LIBDL" = "yes"; then
LIBS="$LIBS -ldl";
fi
-@@ -2016,10 +2016,7 @@
- SS_LDFLAGS=""
+@@ -2412,16 +2412,6 @@
fi
-- SS_RPATH="-rpath $SS_QT_LIBDIR -rpath $libdir"
+ if test "$SS_USE_QT4" = "no"; then
+- SS_RPATH="-rpath $SS_QT3_LIBDIR -rpath $libdir"
+- else
+- SS_RPATH="-rpath $SS_QT4_LIBDIR -rpath $libdir"
+- fi
+-
- if test -n "$SS_X_LIBDIR"; then
- SS_RPATH="$SS_RPATH -rpath $SS_X_LIBDIR"
- fi
-+ SS_RPATH=
+-
+- if test "$SS_USE_QT4" = "no"; then
+ SS_LIBDIRS="-L$SS_TOPSRCDIR/src/kvilib/build/ -L$SS_QT3_LIBDIR"
+ else
+ SS_LIBDIRS="-L$SS_TOPSRCDIR/src/kvilib/build/ -L$SS_QT4_LIBDIR"
+@@ -2470,7 +2460,6 @@
- SS_LIBDIRS="-L$SS_TOPSRCDIR/src/kvilib/build/ -L$SS_QT_LIBDIR"
- if test -n "$SS_X_LIBDIR"; then
-@@ -2053,7 +2050,6 @@
-
if test "$SS_KDE_REQUESTED" = "yes"; then
SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR"
- SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR"
SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR"
SS_LIBLINK="-lkdecore -lkdeui -lkparts $SS_LIBLINK"
- AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 2.x support])
-@@ -2067,7 +2063,6 @@
+ AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 3.x support])
+@@ -2484,7 +2473,6 @@
if test -n "$SS_OTHER_LIBDIRS"; then
SS_LIBDIRS="$SS_LIBDIRS $SS_OTHER_LIBDIRS"
$SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
Modified: people/raul/kvirc/debian/patches/03_eula.patch
===================================================================
--- people/raul/kvirc/debian/patches/03_eula.patch 2008-04-06 17:03:18 UTC (rev 10019)
+++ people/raul/kvirc/debian/patches/03_eula.patch 2008-04-06 17:03:21 UTC (rev 10020)
@@ -1,6 +1,7 @@
---- ./src/modules/about/aboutdialog.cpp.orig 2006-07-25 13:02:18.000000000 +0000
-+++ ./src/modules/about/aboutdialog.cpp 2006-07-25 13:03:01.000000000 +0000
-@@ -129,7 +129,7 @@
+unchanged:
+--- src/modules/about/aboutdialog.cpp 2008-03-30 18:49:51.000000000 +0200
++++ src/modules/about/aboutdialog.cpp.2 2008-03-30 18:49:46.000000000 +0200
+@@ -130,7 +130,7 @@
QString szLicense;
QString szLicensePath;
@@ -9,14 +10,16 @@
if(!KviFileUtils::loadFile(szLicensePath,szLicense))
{
---- ./src/modules/setup/setupwizard.cpp.orig 2006-07-25 13:02:29.000000000 +0000
-+++ ./src/modules/setup/setupwizard.cpp 2006-07-25 13:03:07.000000000 +0000
-@@ -161,7 +161,7 @@
- ed->setWordWrap(QTextEdit::NoWrap);
- KviStr szLicense;
- KviStr szLicensePath;
+only in patch2:
+unchanged:
+--- src/modules/setup/setupwizard.cpp 2008-03-30 18:49:51.000000000 +0200
++++ src/modules/setup/setupwizard.cpp.2 2008-03-30 18:47:49.000000000 +0200
+@@ -197,7 +197,7 @@
+ ed->setWordWrap(KviTalTextEdit::NoWrap);
+ QString szLicense;
+ QString szLicensePath;
- g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING");
+ g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"EULA");
- QString buf;
- if(!KviFileUtils::loadFile(szLicensePath.ptr(),buf))
+ if(!KviFileUtils::loadFile(szLicensePath,szLicense))
{
+ szLicense = __tr("Oops... can't find the license file.\n" \
Modified: people/raul/kvirc/debian/patches/04_buildlog.patch.noauto_apply
===================================================================
--- people/raul/kvirc/debian/patches/04_buildlog.patch.noauto_apply 2008-04-06 17:03:18 UTC (rev 10019)
+++ people/raul/kvirc/debian/patches/04_buildlog.patch.noauto_apply 2008-04-06 17:03:21 UTC (rev 10020)
@@ -1,36 +1,36 @@
---- admin/acinclude.m4.in.orig 2005-02-24 22:58:30.455077480 -0500
-+++ admin/acinclude.m4.in 2005-02-24 22:59:09.864086400 -0500
-@@ -74,33 +74,26 @@
+--- admin/acinclude.m4.in 2008-03-30 18:55:41.000000000 +0200
++++ admin/acinclude.m4.in.2 2008-03-30 18:57:56.000000000 +0200
+@@ -121,33 +121,26 @@
AC_DEFUN([AC_SS_HEADER],
[
-- echo -en "\\033\\1331;32m"
+- AC_CROSS_COLOR([1],[2])
echo "################################################################################"
echo "### $1"
echo "################################################################################"
-- echo -en "\\033\\1330;39m"
+- AC_CROSS_COLOR([0],[9])
])
AC_DEFUN([AC_SS_SECTION],
[
-- echo -en "\\033\\1331;33m"
+- AC_CROSS_COLOR([1],[3])
echo "### $1"
-- echo -en "\\033\\1330;39m"
+- AC_CROSS_COLOR([0],[9])
])
AC_DEFUN([AC_SS_SET_REDINK],
[
-- echo -en "\\033\\1331;31m"
+- AC_CROSS_COLOR([1],[1])
])
AC_DEFUN([AC_SS_SET_GREENINK],
[
-- echo -en "\\033\\1331;32m"
+- AC_CROSS_COLOR([1],[2])
])
AC_DEFUN([AC_SS_SET_NORMALINK],
[
-- echo -en "\\033\\1330;39m"
+- AC_CROSS_COLOR([0],[9])
])
dnl # // ##################################################################################################################
Modified: people/raul/kvirc/debian/patches/08_gcc4fix.patch.noauto_apply
===================================================================
--- people/raul/kvirc/debian/patches/08_gcc4fix.patch.noauto_apply 2008-04-06 17:03:18 UTC (rev 10019)
+++ people/raul/kvirc/debian/patches/08_gcc4fix.patch.noauto_apply 2008-04-06 17:03:21 UTC (rev 10020)
@@ -1,24 +1,3 @@
---- ./src/kvirc/module/kvi_moduleextension.h.orig 2005-02-27 19:20:29.000000000 +0100
-+++ ./src/kvirc/module/kvi_moduleextension.h 2005-08-27 17:45:18.000000000 +0200
-@@ -95,6 +95,8 @@
-
- typedef KviPtrList<KviModuleExtensionDescriptor> KviModuleExtensionDescriptorList;
-
-+class KviModuleExtensionManager;
-+
- extern KVIRC_API KviModuleExtensionManager * g_pModuleExtensionManager;
-
- class KVIRC_API KviModuleExtensionManager
---- ./src/kvirc/kernel/kvi_irccontext.h.orig 2005-08-27 16:49:51.000000000 +0000
-+++ ./src/kvirc/kernel/kvi_irccontext.h 2005-08-27 16:51:03.000000000 +0000
-@@ -29,6 +29,7 @@
- #include <qobject.h>
-
- class KviChannel;
-+class KviConsole;
- class KviQuery;
- class KviQuery;
- class KviFrame;
--- src/kvirc/ui/kvi_console.h 2005-08-27 16:26:44.000000000 +0200
+++ src/kvirc/ui/kvi_console.h.new 2005-08-27 21:12:51.000000000 +0200
@@ -46,6 +46,8 @@
Modified: people/raul/kvirc/debian/patches/09_plugin_dir.patch
===================================================================
--- people/raul/kvirc/debian/patches/09_plugin_dir.patch 2008-04-06 17:03:18 UTC (rev 10019)
+++ people/raul/kvirc/debian/patches/09_plugin_dir.patch 2008-04-06 17:03:21 UTC (rev 10020)
@@ -60,10 +60,10 @@
debian/tmp/usr/lib/*.so.*
-debian/tmp/usr/share/kvirc/*/modules/*.so
+debian/tmp/usr/lib/kvirc/*/modules/*.so
-diff -Nru src/kvirc/kernel/kvi_app_fs.cpp src/kvirc/kernel/kvi_app_fs.cpp
---- src/kvirc/kernel/kvi_app_fs.cpp 2006-07-28 14:51:38.000000000 +0200
-+++ src/kvirc/kernel/kvi_app_fs.cpp 2006-11-02 02:35:01.000000000 +0100
-@@ -50,8 +50,11 @@
+diff -Nru src/kvirc/kernel/kvi_app_fs.cpp src/kvirc/kernel/kvi_app_fs.cpp.2
+--- src/kvirc/kernel/kvi_app_fs.cpp 2008-03-30 22:02:35.000000000 +0200
++++ src/kvirc/kernel/kvi_app_fs.cpp.2 2008-03-30 22:05:15.000000000 +0200
+@@ -52,8 +52,11 @@
{
case None : break;
case Pics : szData.append("pics"); break;
@@ -71,11 +71,11 @@
+ // Local hack for Debian
case Modules :
- case Plugins : szData.append("modules"); break;
-+ case Plugins : szData = "/usr/lib/kvirc/" KVI_VERSION_BRANCH "/modules"; break;
++ case Plugins : szData = "/usr/lib/kvirc/" KVI_VERSION_BRANCH "/modules"; break;
+
- case ConfigPlugins : KviQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break;
- case ConfigScripts : KviQString::appendFormatted(szData,"config%sscripts",KVI_PATH_SEPARATOR); break;
- case Help :
+ case EasyPlugins : szData.append("easyplugins"); break;
+ case ConfigPlugins : KviQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break;
+ case ConfigScripts : KviQString::appendFormatted(szData,"config%sscripts",KVI_PATH_SEPARATOR); break;
diff -Nru src/kvirc/kernel/kvi_app_setup.cpp src/kvirc/kernel/kvi_app_setup.cpp
--- src/kvirc/kernel/kvi_app_setup.cpp 2006-07-28 14:51:38.000000000 +0200
+++ src/kvirc/kernel/kvi_app_setup.cpp 2006-11-02 02:35:01.000000000 +0100
More information about the pkg-kde-commits
mailing list