aboutsummaryrefslogtreecommitdiffstats
path: root/net/licq/files
diff options
context:
space:
mode:
authorgreen <green@FreeBSD.org>2000-08-10 04:00:49 +0800
committergreen <green@FreeBSD.org>2000-08-10 04:00:49 +0800
commit590c2fbb0c740d107d3e18543f03d418948b69cc (patch)
tree7acb23a7e9465d66aad09db21c0d0819f24196e5 /net/licq/files
parent2d0ef643eaf10c5ee7d4f5980b61cf3b38dc5d6c (diff)
downloadfreebsd-ports-gnome-590c2fbb0c740d107d3e18543f03d418948b69cc.tar.gz
freebsd-ports-gnome-590c2fbb0c740d107d3e18543f03d418948b69cc.tar.zst
freebsd-ports-gnome-590c2fbb0c740d107d3e18543f03d418948b69cc.zip
Get rid of the patch to qt-gui's "configure" and replace it with
patching "configure.in" and "aclocal.m4". Disable XScreenSaver support in the QT GUI since libXss is not a shared library in any version of X we have.
Diffstat (limited to 'net/licq/files')
-rw-r--r--net/licq/files/patch-aa67
-rw-r--r--net/licq/files/patch-ae41
2 files changed, 52 insertions, 56 deletions
diff --git a/net/licq/files/patch-aa b/net/licq/files/patch-aa
index dd494d48d937..fd53298e4563 100644
--- a/net/licq/files/patch-aa
+++ b/net/licq/files/patch-aa
@@ -1,56 +1,11 @@
---- plugins/qt-gui/configure.orig Tue Jul 11 18:54:28 2000
-+++ plugins/qt-gui/configure Mon Jul 24 03:40:56 2000
-@@ -4138,7 +4138,7 @@
- fi
-
- for qt_dir in $qt_library_dirs; do
-- for qt_check_lib in $qt_dir/libqt.so.2; do
-+ for qt_check_lib in $qt_dir/libqt2.so.3; do
- if test -r $qt_check_lib; then
- ac_qt_libraries=$qt_dir
- break 2
-@@ -4158,7 +4158,7 @@
- have_qt_lib="no"
- else
- have_qt_lib="yes"
-- output=`eval "strings $ac_cv_lib_qtlib/libqt.so | grep -l QCString"`
-+ output=`eval "strings $ac_cv_lib_qtlib/libqt2.so | grep -l QCString"`
- if test -z "$output"; then
- { echo "configure: error:
- The Qt lib directory "$ac_cv_lib_qtlib"
-@@ -4172,7 +4172,7 @@
- Please check your installation.
-
- Use the --with-qt-libraries option if we found the wrong Qt lib.
-- " 1>&2; exit 1; }
-+ " 1>&2; }
- fi
- fi
-
-@@ -4226,7 +4226,7 @@
- /usr/X11/include/qt \
- /usr/X11/include/X11/qt \
- /usr/X11R6/include \
-- /usr/X11R6/include/qt \
-+ /usr/X11R6/include/qt2 \
- /usr/X11R6/include/X11/qt \
- /usr/X11/lib/qt/include"
-
-@@ -4318,7 +4318,7 @@
- fi
-
- # Extract the first word of "moc", so it can be a program name with args.
--set dummy moc; ac_word=$2
-+set dummy moc2; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:4324: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then
-@@ -4343,7 +4343,7 @@
- fi
- done
- IFS="$ac_save_ifs"
-- test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="$QTDIR/bin/moc"
-+ test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="$QTDIR/bin/moc2"
- ;;
- esac
- fi
+--- plugins/qt-gui/configure.in.orig Wed Aug 9 14:07:59 2000
++++ plugins/qt-gui/configure.in Wed Aug 9 14:15:46 2000
+@@ -51,8 +51,6 @@
+ LICQ_CHECK_X11HEADERS
+
+ XSS_LIBS="no"
+-AC_CHECK_X_LIB(Xext, XScreenSaverRegister,[XSS_LIBS=""],[], [-lX11 -lXext -lm])
+-AC_CHECK_X_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-lXss"],[],[-lX11 -lXext -lm])
+ if test \! "$XSS_LIBS" = "no"; then
+ AC_CHECK_X_HEADER(X11/extensions/scrnsaver.h,[AC_DEFINE(USE_SCRNSAVER)])
+ else
diff --git a/net/licq/files/patch-ae b/net/licq/files/patch-ae
new file mode 100644
index 000000000000..ce5e40b135cc
--- /dev/null
+++ b/net/licq/files/patch-ae
@@ -0,0 +1,41 @@
+--- plugins/qt-gui/aclocal.m4.orig Tue Jul 11 18:54:25 2000
++++ plugins/qt-gui/aclocal.m4 Wed Aug 9 14:53:40 2000
+@@ -59,7 +59,7 @@
+ fi
+
+ for qt_dir in $qt_library_dirs; do
+- for qt_check_lib in $qt_dir/libqt.so.2; do
++ for qt_check_lib in $qt_dir/libqt2.so.3; do
+ if test -r $qt_check_lib; then
+ ac_qt_libraries=$qt_dir
+ break 2
+@@ -79,17 +79,12 @@
+ else
+ have_qt_lib="yes"
+ dnl Check if we have the right lib
+- output=`eval "strings $ac_cv_lib_qtlib/libqt.so | grep -l QCString"`
++ output=`eval "strings $ac_cv_lib_qtlib/libqt2.so | grep -l QCString"`
+ if test -z "$output"; then
+ AC_MSG_ERROR([
+ The Qt lib directory "$ac_cv_lib_qtlib"
+ found by configure doesn't contain a Qt 2.1.x library.
+
+- To overcome special features of the GNU ld (aka bugs), the
+- libqt.so file _needs_ to point to libqt.so.2 which needs
+- to point to a Qt 2.1 library.
+- (this is only needed during compiling and linking, not at runtime)
+-
+ Please check your installation.
+
+ Use the --with-qt-libraries option if we found the wrong Qt lib.
+@@ -196,8 +191,8 @@
+
+ AC_PATH_PROG(
+ MOC,
+- moc,
+- $QTDIR/bin/moc,
++ moc2,
++ $QTDIR/bin/moc2,
+ $QTDIR/bin:/usr/lib/qt2/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH
+ )
+ else