summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArkadiusz Miƛkiewicz2001-11-12 23:51:53 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit50d5ea0dd3acbf411fcee9eab0fe43d6f6b6e608 (patch)
treeab0dfbc314c145e8ef30b232aaa9f1e18e893ecc
parente3d85ce81c3772471376ff19f9e6c4cbb5bb8ce1 (diff)
downloadgabber-50d5ea0dd3acbf411fcee9eab0fe43d6f6b6e608.zip
gabber-50d5ea0dd3acbf411fcee9eab0fe43d6f6b6e608.tar.gz
e30158cca2251bd72f4b3bbee6395664 gabber-0.8.4.tar.gz
Changed files: gabber-DESTDIR.patch -> 1.2 gabber-ac_fixes.patch -> 1.2
-rw-r--r--gabber-DESTDIR.patch18
-rw-r--r--gabber-ac_fixes.patch117
2 files changed, 26 insertions, 109 deletions
diff --git a/gabber-DESTDIR.patch b/gabber-DESTDIR.patch
index 25e7cc3..6028e7b 100644
--- a/gabber-DESTDIR.patch
+++ b/gabber-DESTDIR.patch
@@ -1,6 +1,6 @@
-diff -urN gabber-0.8.2.org/doc/C/Makefile.am gabber-0.8.2/doc/C/Makefile.am
---- gabber-0.8.2.org/doc/C/Makefile.am Wed Apr 25 01:29:33 2001
-+++ gabber-0.8.2/doc/C/Makefile.am Wed Apr 25 01:30:27 2001
+diff -urN gabber-0.8.4.org/doc/C/Makefile.am gabber-0.8.4/doc/C/Makefile.am
+--- gabber-0.8.4.org/doc/C/Makefile.am Wed Aug 29 23:55:26 2001
++++ gabber-0.8.4/doc/C/Makefile.am Thu Aug 30 00:42:43 2001
@@ -41,21 +41,21 @@
## when we make dist, we include the generated HTML so people don't
## have to have the docbook tools
@@ -31,3 +31,15 @@ diff -urN gabber-0.8.2.org/doc/C/Makefile.am gabber-0.8.2/doc/C/Makefile.am
done
gabber.ps: gabber.sgml
+diff -urN gabber-0.8.4.org/pixmaps/Makefile.am gabber-0.8.4/pixmaps/Makefile.am
+--- gabber-0.8.4.org/pixmaps/Makefile.am Wed Aug 29 23:55:26 2001
++++ gabber-0.8.4/pixmaps/Makefile.am Thu Aug 30 00:42:59 2001
+@@ -67,7 +67,7 @@
+ glade_DATA = $(glade_pixmaps)
+
+ install-exec-hook:
+- (cd $(datadir)/gabber; \
++ (cd $(DESTDIR)$(datadir)/gabber; \
+ ln -sf ../pixmaps/gnome-info.png gnome-info.png; \
+ ln -sf ../pixmaps/gnome-lockscreen.png gnome-locksreen.png; \
+ ln -sf ../pixmaps/gnome-globe.png gnome-globe.png; \
diff --git a/gabber-ac_fixes.patch b/gabber-ac_fixes.patch
index 2221427..ef32190 100644
--- a/gabber-ac_fixes.patch
+++ b/gabber-ac_fixes.patch
@@ -1,107 +1,12 @@
---- gabber-0.8.2/configure.in~ Thu Mar 29 03:22:20 2001
-+++ gabber-0.8.2/configure.in Thu Jul 5 13:34:15 2001
-@@ -315,74 +315,6 @@
- ])
- fi
-
--dnl ******************************
--dnl CFLAGS for release and devel versions
--dnl ******************************
--AC_ARG_ENABLE(debug,
-- [ --enable-debug compile with debugging (for development)],
-- debug=$enable_debug,
-- debug=no
--)
--AC_MSG_CHECKING(for debugging)
--if test "x$debug" = xyes; then
-- AC_MSG_RESULT(yes)
-- BUILD_TYPE="$BUILD_TYPE Debug"
-- CFLAGS="$CFLAGS -g"
-- CXXFLAGS="$CXXFLAGS -g"
--else
-- AC_MSG_RESULT(no)
-- CFLAGS="$CFLAGS -s"
-- CXXFLAGS="$CXXFLAGS -s"
--fi
--
--AC_ARG_ENABLE(optimize,
-- [ --enable-optimize compile with optimizations (not for packaging)],
-- optimize=$enable_optimize,
-- optimize=no
--)
--
--AC_MSG_CHECKING(for optimization)
--if test "x$optimize" = xyes; then
-- AC_MSG_RESULT(yes)
-- BUILD_TYPE="$BUILD_TYPE Optimize"
-- if test "x$GCC" = xyes; then
-- CFLAGS="$CFLAGS -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations"
-- CXXFLAGS="$CXX_FLAGS -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations"
-- AC_MSG_CHECKING(for special compiler settings)
-- case "${host}" in
-- i386-*-*)
-- MORE_CFLAGS="-malign-loops=2 -malign-jumps=2 -malign-functions=2"
-- ;;
-- i486-*-*)
-- MORE_CFLAGS="-m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2"
-- ;;
-- i586-*-*)
-- MORE_CFLAGS="-march=pentium -malign-loops=2 -malign-jumps=2 -malign-functions=2"
-- ;;
-- i686-*-*)
-- MORE_CFLAGS="-march=pentiumpro -malign-loops=2 -malign-jumps=2 -malign-functions=2"
-- ;;
-- *)
-- MORE_CFLAGS=""
-- ;;
-- esac
-- if test "x$MORE_CFLAGS" = x; then
-- AC_MSG_RESULT(no)
-- else
-- AC_MSG_RESULT(yes)
-- CFLAGS="$CFLAGS $MORE_CFLAGS"
-- CXXFLAGS="$CXX_FLAGS $MORE_CXXFLAGS"
-- fi
-- else
-- CFLAGS=-O2
-- CXX_FLAGS=-02
-- fi
--else
-- AC_MSG_RESULT(no)
-- CFLAGS="$CFLAGS -O0"
-- CXX_FLAGS="$CXX_FLAGS -O0"
--fi
--
- dnl **************************************************
- dnl * OpenSSL check (directory check blatantly ripped
- dnl * from OpenSSH's configure.in)
---- gabber-0.8.2/jabberoo/configure.in~ Tue Feb 13 02:05:22 2001
-+++ gabber-0.8.2/jabberoo/configure.in Thu Jul 5 13:41:49 2001
-@@ -20,27 +20,6 @@
- dnl Checks for library functions.
- AC_FUNC_MEMCMP
-
--dnl CFLAGS for release and devel versions
--CFLAGS=""
--CXXFLAGS=""
--AC_ARG_ENABLE(debug,
-- [ --enable-debug compile with debugging (for development)],
-- debug=$enable_debug
--)
--AC_MSG_CHECKING(for debugging)
--if test "x$debug" = xyes; then
-- AC_MSG_RESULT(yes)
-- BUILD_TYPE="$BUILD_TYPE Debug"
-- CFLAGS="$CFLAGS -g"
-- CXXFLAGS="$CXXFLAGS -g"
--else
-- CFLAGS="$CFLAGS -O2"
-- CXXFLAGS="$CXXFLAGS -O2"
-- AC_MSG_RESULT(no)
--fi
--
--
--
- dnl Check for endianess
- AC_C_BIGENDIAN
+diff -urN gabber-0.8.4.org/configure.in gabber-0.8.4/configure.in
+--- gabber-0.8.4.org/configure.in Wed Aug 29 23:55:24 2001
++++ gabber-0.8.4/configure.in Wed Aug 29 23:55:45 2001
+@@ -60,7 +60,7 @@
+ dnl * Here are the LANGuages
+ dnl ******************************
+ ALL_LINGUAS="az da de es fi fr ko nl no ru sv tr uk"
+-AM_GNOME_GETTEXT
++AM_GNU_GETTEXT
+ EVO_CHECK_LIB(libglade, 0.11, libglade)
+ EVO_CHECK_LIB(GAL, 0.3, gal)