summaryrefslogtreecommitdiff
path: root/net/gabber/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/gabber/files')
-rw-r--r--net/gabber/files/patch-ae17
-rw-r--r--net/gabber/files/patch-aj68
-rw-r--r--net/gabber/files/patch-ak11
-rw-r--r--net/gabber/files/patch-al32
-rw-r--r--net/gabber/files/patch-am14
-rw-r--r--net/gabber/files/patch-ao11
6 files changed, 21 insertions, 132 deletions
diff --git a/net/gabber/files/patch-ae b/net/gabber/files/patch-ae
index 850bd445eed4..d2eafb79abbf 100644
--- a/net/gabber/files/patch-ae
+++ b/net/gabber/files/patch-ae
@@ -1,15 +1,14 @@
---- src/GabberConfig.hh.in.orig Thu Jan 18 12:28:59 2001
-+++ src/GabberConfig.hh.in Thu Jan 18 12:30:07 2001
-@@ -3,9 +3,9 @@
- #include <config.h>
- static const char* GABBER_PACKAGE = PACKAGE;
+--- src/GabberConfig.hh.in.orig Sat Feb 3 23:19:41 2001
++++ src/GabberConfig.hh.in Wed Mar 28 14:37:49 2001
+@@ -5,7 +5,7 @@
static const char* GABBER_VERSION = VERSION;
--static const char* GABBER_GLADEFILE = "@prefix@/share/gabber/gabber.glade";
+-static const char* GABBER_GLADEDIR = "@prefix@/share/gabber/";
-static const char* GABBER_SHAREDIR = "@prefix@/share/gabber/";
-+static const char* GABBER_GLADEFILE = "@prefix@/share/gnome/gabber/gabber.glade";
-+static const char* GABBER_SHAREDIR = "@prefix@/share/gnome/gabber/";
++static const char* GABBER_GLADEDIR = "@datadir@/gabber/";
++static const char* GABBER_SHAREDIR = "@datadir@/gabber/";
static const char* GABBER_CONFIG = "/Gabber/";
-static const char* GABBER_PIXPATH = "@prefix@/share/pixmaps/gabber/";
+-static const char* GABBER_CSSFILE = "@prefix@/share/gabber/gabber-logs.css";
+static const char* GABBER_PIXPATH = "@datadir@/pixmaps/gabber/";
- static const char* GABBER_CSSFILE = "@prefix@/share/gabber/gabber-logs.css";
++static const char* GABBER_CSSFILE = "@datadir@/gabber/gabber-logs.css";
#endif
diff --git a/net/gabber/files/patch-aj b/net/gabber/files/patch-aj
deleted file mode 100644
index 4d3bae2d00af..000000000000
--- a/net/gabber/files/patch-aj
+++ /dev/null
@@ -1,68 +0,0 @@
---- configure.in.orig Thu Jan 18 08:22:50 2001
-+++ configure.in Mon Jan 29 23:48:54 2001
-@@ -70,15 +70,15 @@
- save_CFLAGS="$CFLAGS"
- save_LDFLAGS="$LDFLAGS"
- CFLAGS="$CFLAGS $ICONV_CFLAGS"
--LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
--AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_LINK([
--#include <iconv.h>
-+LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv"
-+AC_CACHE_CHECK(for iconv in -lgiconv, ac_cv_libiconv, AC_TRY_LINK([
-+#include <giconv.h>
- ], [
- iconv_t cd;
- cd = iconv_open ("UTF-8", "ISO-8859-1");
- ], ac_cv_libiconv=yes, ac_cv_libiconv=no))
- if test $ac_cv_libiconv = yes; then
-- ICONV_LIBS="$ICONV_LIBS -liconv"
-+ ICONV_LIBS="$ICONV_LIBS -lgiconv"
- have_iconv=yes
- else
- CFLAGS="$save_CFLAGS"
-@@ -91,7 +91,7 @@
- AC_CHECK_FUNCS(gnu_get_libc_version)
- fi
- AC_CACHE_CHECK([if iconv() handles UTF-8], ac_cv_libiconv_utf8, AC_TRY_RUN([
--#include <iconv.h>
-+#include <giconv.h>
- #include <stdlib.h>
- #include <string.h>
- #ifdef HAVE_GNU_GET_LIBC_VERSION
-@@ -151,22 +151,22 @@
- dnl ******************************
- dnl Gnome App Lib checking
- dnl ******************************
--dnl AC_MSG_CHECKING(for Gnome App libraries (GAL) >= 0.3)
--dnl if $GNOME_CONFIG --libs gal > /dev/null 2>&1; then
--dnl vers=`$GNOME_CONFIG --modversion gal | sed -e "s/gal-//" -e 's/cvs$//' -e 's/pre$//' | \
--dnl awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'`
--dnl if test "$vers" -ge 30000; then
--dnl AC_MSG_RESULT(found)
--dnl else
--dnl AC_MSG_ERROR(You need at least GNOME Application Lib (GAL) 0.3)
--dnl fi
--dnl else
--dnl AC_MSG_ERROR(Did not find GnomeAppLib (GAL) installed)
--dnl fi
-+AC_MSG_CHECKING(for Gnome App libraries (GAL) >= 0.3)
-+if $GNOME_CONFIG --libs gal > /dev/null 2>&1; then
-+ vers=`$GNOME_CONFIG --modversion gal | sed -e "s/gal-//" -e 's/cvs$//' -e 's/pre$//' | \
-+ awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'`
-+ if test "$vers" -ge 30000; then
-+ AC_MSG_RESULT(found)
-+ else
-+ AC_MSG_ERROR(You need at least GNOME Application Lib (GAL) 0.3)
-+ fi
-+else
-+ AC_MSG_ERROR(Did not find GnomeAppLib (GAL) installed)
-+fi
-
- dnl add 'gal' to both of these if you want gal dependency
--EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs libglade gnomeui` $ICONV_LIBS $UNICODE_LIBS"
--EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags libglade` $ICONV_CFLAGS $UNICODE_CFLAGS"
-+EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs libglade gnomeui gal` $ICONV_LIBS $UNICODE_LIBS"
-+EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags libglade gal` $ICONV_CFLAGS $UNICODE_CFLAGS"
-
- AC_SUBST(EXTRA_GNOME_LIBS)
- AC_SUBST(EXTRA_GNOME_CFLAGS)
diff --git a/net/gabber/files/patch-ak b/net/gabber/files/patch-ak
deleted file mode 100644
index 6edc8c35475d..000000000000
--- a/net/gabber/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/GabberUtility.cc.orig Thu Jan 18 12:39:58 2001
-+++ src/GabberUtility.cc Thu Jan 18 12:40:12 2001
-@@ -1,7 +1,7 @@
-
- #include "GabberUtility.hh"
- #include "Gabber.hh"
--#include "e-unicode.h"
-+#include <gal/widgets/e-unicode.h>
-
- using namespace jabberoo;
-
diff --git a/net/gabber/files/patch-al b/net/gabber/files/patch-al
index ee8e5d30071f..1cb21d75c9ef 100644
--- a/net/gabber/files/patch-al
+++ b/net/gabber/files/patch-al
@@ -1,42 +1,26 @@
---- configure.orig Thu Jan 18 08:27:41 2001
-+++ configure Mon Jan 29 23:54:52 2001
-@@ -4900,9 +4900,9 @@
- save_CFLAGS="$CFLAGS"
- save_LDFLAGS="$LDFLAGS"
+--- configure.orig Wed Mar 28 19:22:35 2001
++++ configure Thu Apr 19 12:54:15 2001
+@@ -4974,5 +4974,5 @@
CFLAGS="$CFLAGS $ICONV_CFLAGS"
-LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
-echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
--echo "configure:4906: checking for iconv in -liconv" >&5
+-echo "configure:4978: checking for iconv in -liconv" >&5
+LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv"
+echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
-+echo "configure:4906: checking for iconv in -lgiconv" >&5
++echo "configure:4978: checking for iconv in -lgiconv" >&5
if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4910,7 +4910,7 @@
- #line 4911 "configure"
- #include "confdefs.h"
+@@ -4984,3 +4984,3 @@
-#include <iconv.h>
+#include <giconv.h>
- int main() {
-
-@@ -4933,7 +4933,7 @@
-
- echo "$ac_t""$ac_cv_libiconv" 1>&6
+@@ -5007,3 +5007,3 @@
if test $ac_cv_libiconv = yes; then
- ICONV_LIBS="$ICONV_LIBS -liconv"
+ ICONV_LIBS="$ICONV_LIBS -lgiconv"
have_iconv=yes
- else
- CFLAGS="$save_CFLAGS"
-@@ -5059,7 +5059,7 @@
- #line 5060 "configure"
- #include "confdefs.h"
+@@ -5133,3 +5133,3 @@
-#include <iconv.h>
+#include <giconv.h>
#include <stdlib.h>
- #include <string.h>
- #ifdef HAVE_GNU_GET_LIBC_VERSION
diff --git a/net/gabber/files/patch-am b/net/gabber/files/patch-am
index 2aef3a0a4ea5..9ac7b8700186 100644
--- a/net/gabber/files/patch-am
+++ b/net/gabber/files/patch-am
@@ -1,11 +1,7 @@
---- src/Makefile.in.orig Thu Jan 18 08:32:41 2001
-+++ src/Makefile.in Mon Jan 29 23:59:01 2001
-@@ -148,7 +148,7 @@
- gabber_SOURCES = main.cc xtext.h xtext.c e-cache.h e-cache.c e-font.h e-font.c e-unicode.h e-unicode.c TCPTransmitter.hh TCPTransmitter.cc GabberLogger.hh GabberLogger.cc GabberUtility.hh GabberUtility.cc ConfigManager.hh ConfigManager.cc GabberApp.hh GabberApp.cc BaseGabberWindow.hh BaseGabberWindow.cc GabberWin.hh GabberWin.cc ChatView.hh ChatView.cc RosterView.hh RosterView.cc LoginDlg.hh LoginDlg.cc SubscriptionRequestDlg.hh SubscriptionRequestDlg.cc PrefsWin.hh PrefsWin.cc GCJoinDlg.hh GCJoinDlg.cc EditUserDlg.hh EditUserDlg.cc EasyOptionMenu.hh EasyOptionMenu.cc StatusDlg.hh StatusDlg.cc AddToGroupDlg.hh AddToGroupDlg.cc AddUserDruid.hh AddUserDruid.cc WelcomeDruid.hh WelcomeDruid.cc UserInfoWin.hh UserInfoWin.cc StatusDock.hh StatusDock.cc RawXML.hh RawXML.cc HistoryDlg.hh HistoryDlg.cc TransInfoDlg.hh TransInfoDlg.cc AgentInterface.hh AgentInterface.cc FilterInterface.hh FilterInterface.cc EditGroupsDlg.hh EditGroupsDlg.cc MessageManager.hh MessageManager.cc MessageViews.hh MessageViews.cc GPGInterface.hh GPGInterface.cc GabberGPG.hh GabberGPG.cc $(ssl_sources)
+--- src/Makefile.in.orig Wed Mar 14 16:07:36 2001
++++ src/Makefile.in Wed Mar 28 14:52:10 2001
+@@ -156,3 +156,3 @@
-
--gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@ ../jabberoo/src/libjabberoo.a ../jabberoo/expat/libexpat.a -lxml
-+gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@ ../jabberoo/src/libjabberoo.a ../jabberoo/expat/libexpat.a -lxml -liconv
-
- gabber_LDFLAGS = @GABBER_STATIC@
+-gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@ @XSS_LIBS@ ../jabberoo/src/libjabberoo.a ../jabberoo/expat/libexpat.a -lxml
++gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@ @XSS_LIBS@ ../jabberoo/src/libjabberoo.a ../jabberoo/expat/libexpat.a -lxml -lgiconv
diff --git a/net/gabber/files/patch-ao b/net/gabber/files/patch-ao
deleted file mode 100644
index 673ba27ee2c3..000000000000
--- a/net/gabber/files/patch-ao
+++ /dev/null
@@ -1,11 +0,0 @@
---- jabberoo/src/Makefile.in.orig Tue Jan 30 02:10:13 2001
-+++ jabberoo/src/Makefile.in Tue Jan 30 02:10:32 2001
-@@ -74,7 +74,7 @@
- libjabberoo_a_LIBS = ../expat/libexpat.a @SIGC_LIBS@
- INCLUDES = -I../include @SIGC_CFLAGS@
-
--CXXFLAGS = -O2
-+#CXXFLAGS = -O2
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES =
- LIBRARIES = $(noinst_LIBRARIES)
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-19 06:43:29 +0000