From dfce3a8cdf0709133a18535d396bd52b9e74022c Mon Sep 17 00:00:00 2001 From: cvs2git Date: Tue, 7 Aug 2001 13:54:40 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create branch 'DEVEL'. Sprout from master 2001-08-07 13:54:40 UTC aflinta '- adapted to galeon 0.12pre1' Delete: galeon-gettext.patch galeon-macros.patch galeon-ns-with-service.patch galeon.spec --- galeon-gettext.patch | 12 --- galeon-macros.patch | 139 ----------------------------------- galeon-ns-with-service.patch | 24 ------ galeon.spec | 87 ---------------------- 4 files changed, 262 deletions(-) delete mode 100644 galeon-gettext.patch delete mode 100644 galeon-macros.patch delete mode 100644 galeon-ns-with-service.patch delete mode 100644 galeon.spec diff --git a/galeon-gettext.patch b/galeon-gettext.patch deleted file mode 100644 index 3e2c385..0000000 --- a/galeon-gettext.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur galeon-0.11.1/configure.in galeon-0.11.1.new/configure.in ---- galeon-0.11.1/configure.in Sun Jul 1 16:46:29 2001 -+++ galeon-0.11.1.new/configure.in Sun Jul 1 16:57:30 2001 -@@ -320,7 +320,7 @@ - - dnl Add the languages which your application supports here. - ALL_LINGUAS="az ca cs da de es et fi fr gl hr hu it ja ko lt nl no pl pt_BR ro ru sk sl sv tr uk zh_TW.Big5 ms zh_CN.GB2312" --AM_GNOME_GETTEXT -+AM_GNU_GETTEXT - - dnl Set PACKAGE_LOCALE_DIR in config.h. - if test "x${prefix}" = "xNONE"; then diff --git a/galeon-macros.patch b/galeon-macros.patch deleted file mode 100644 index f3961ca..0000000 --- a/galeon-macros.patch +++ /dev/null @@ -1,139 +0,0 @@ -diff -urN galeon-0.10.4.org/acinclude.m4 galeon-0.10.4/acinclude.m4 ---- galeon-0.10.4.org/acinclude.m4 Thu Jan 1 01:00:00 1970 -+++ galeon-0.10.4/acinclude.m4 Mon Apr 23 10:21:47 2001 -@@ -0,0 +1,135 @@ -+AC_DEFUN(AM_PATH_GNOME, -+[dnl -+dnl Get the cflags and libraries from the gnome-config script -+dnl -+AC_ARG_WITH(gnome-prefix,[ --with-gnome-prefix=PFX Prefix where GNOME is installed (optional)], -+ gnome_config_prefix="$withval", gnome_config_prefix="") -+AC_ARG_WITH(gnome-exec-prefix,[ --with-gnome-exec-prefix=PFX Exec prefix where GNOME is installed (optional)], -+ gnome_config_exec_prefix="$withval", gnome_config_exec_prefix="") -+ -+ if test x$gnome_config_exec_prefix != x ; then -+ gnome_config_args="$gnome_config_args --exec-prefix=$gnome_config_exec_prefix" -+ if test x${GNOME_CONFIG+set} != xset ; then -+ GNOME_CONFIG=$gnome_config_exec_prefix/bin/gnome-config -+ fi -+ fi -+ if test x$gnome_config_prefix != x ; then -+ gnome_config_args="$gnome_config_args --prefix=$gnome_config_prefix" -+ if test x${GNOME_CONFIG+set} != xset ; then -+ GNOME_CONFIG=$gnome_config_prefix/bin/gnome-config -+ fi -+ fi -+ -+ AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) -+ min_gnome_version=ifelse([$1], , 1.1.0, $1) -+ -+ AC_MSG_CHECKING(for GNOME - version >= $min_gnome_version) -+ no_gnome="" -+ if test "$GNOME_CONFIG" = "no" ; then -+ no_gnome=yes -+ else -+ GNOME_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnome`" -+ GNOME_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnome`" -+ GNOMEUI_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnomeui`" -+ GNOMEUI_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnomeui`" -+ -+ gnome_config_major_version=`$GNOME_CONFIG $gnome_config_args --version | \ -+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -+ gnome_config_minor_version=`$GNOME_CONFIG $gnome_config_args --version | \ -+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -+ gnome_config_micro_version=`$GNOME_CONFIG $gnome_config_args --version | \ -+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -+ needed_major_version=`echo $min_gnome_version | \ -+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -+ needed_minor_version=`echo $min_gnome_version | \ -+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -+ needed_micro_version=`echo $min_gnome_version | \ -+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -+ -+ if test $gnome_config_major_version -lt $needed_major_version; then -+ ifelse([$3], , :, [$3]) -+ no_gnome=yes -+ elif test $gnome_config_major_version = $needed_major_version; then -+ if test -n "$needed_minor_version" -a $gnome_config_minor_version -lt $needed_minor_version; then -+ ifelse([$3], , :, [$3]) -+ no_gnome=yes -+ elif test -n "$needed_minor_version" -a $gnome_config_minor_version = $needed_minor_version; then -+ if test -n "$needed_micro_version" -a $gnome_config_micro_version -lt $needed_micro_version; then -+ ifelse([$3], , :, [$3]) -+ no_gnome=yes -+ fi -+ fi -+ fi -+ fi -+ AC_SUBST(GNOME_CFLAGS) -+ AC_SUBST(GNOME_LIBS) -+ AC_SUBST(GNOMEUI_CFLAGS) -+ AC_SUBST(GNOMEUI_LIBS) -+ -+ if test "x$no_gnome" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$GNOME_CONFIG" = "no" ; then -+ echo "*** The gnome-config script installed by GNOME could not be found" -+ echo "*** If GNOME was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the GNOME_CONFIG environment variable to the" -+ echo "*** full path to gnome-config." -+ else -+ : -+ fi -+ GNOME_CFLAGS="" -+ GNOME_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ -+ tmp_gnome_libdir=`$GNOME_CONFIG $gnome_config_args --libdir` -+ if test -n "$4"; then -+ AC_MSG_CHECKING([for additional GNOME modules]) -+ fi -+ for module in $4 ""; do -+ gnome_m4_notfound=no -+ if test "$module" = zvt; then -+ ZVT_LIBS="`$GNOME_CONFIG $gnome_config_args --libs zvt`" -+ AC_SUBST(ZVT_LIBS) -+ elif test "$module" = gtk; then -+ GTK_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gtk`" -+ GTK_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gtk`" -+ AC_SUBST(GTK_CFLAGS) -+ AC_SUBST(GTK_LIBS) -+ elif test "$module" = "glib"; then -+ GLIB_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags glib`" -+ GLIB_LIBS="`$GNOME_CONFIG $gnome_config_args --libs glib`" -+ AC_SUBST(GLIB_CFLAGS) -+ AC_SUBST(GLIB_LIBS) -+ elif test "$module" = "oaf"; then -+ OAF_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags oaf`" -+ OAF_LIBS="`$GNOME_CONFIG $gnome_config_args --libs oaf`" -+ AC_SUBST(OAF_CFLAGS) -+ AC_SUBST(OAF_LIBS) -+ elif test "$module" = "gnorba"; then -+ GNORBA_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnorba`" -+ GNORBA_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnorba`" -+ AC_SUBST(GNORBA_CFLAGS) -+ AC_SUBST(GNORBA_LIBS) -+ elif test -n "$module"; then -+ if $GNOME_CONFIG $gnome_config_args --cflags $module >/dev/null 2>&1; then -+ tmp_bsnom=`echo $module | tr a-z A-Z` -+ eval $tmp_bsnom'_CFLAGS'=\"`$GNOME_CONFIG $gnome_config_args --cflags $module`\" -+ eval $tmp_bsnom'_LIBS'=\"`$GNOME_CONFIG $gnome_config_args --libs $module`\" -+ else -+ AC_MSG_RESULT([*** $module library is not installed]) -+ ifelse([$3], , :, [$3]) -+ gnome_m4_notfound=yes -+ fi -+ fi -+ if test "$gnome_m4_notfound" = no; then -+ echo $ac_n " $module" 1>&6 -+ fi -+ done -+ if test -n "$4"; then -+ AC_MSG_RESULT([]) -+ fi -+]) -+ diff --git a/galeon-ns-with-service.patch b/galeon-ns-with-service.patch deleted file mode 100644 index adb8789..0000000 --- a/galeon-ns-with-service.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur galeon-0.11.3.orig/src/GaleonWrapper.cpp galeon-0.11.3/src/GaleonWrapper.cpp ---- galeon-0.11.3.orig/src/GaleonWrapper.cpp Wed Jul 25 00:43:50 2001 -+++ galeon-0.11.3/src/GaleonWrapper.cpp Sat Aug 4 05:39:19 2001 -@@ -124,7 +124,7 @@ - GHFactory, - PR_TRUE); - -- NS_WITH_SERVICE(nsIGlobalHistory, inst, NS_GLOBALHISTORY_CONTRACTID, &result); -+ nsCOMPtr inst = do_GetService(NS_GLOBALHISTORY_CONTRACTID, &result); - dsHistory->SetGlobalHistory(inst); - - nsCOMPtr piWin; -diff -Nur galeon-0.11.3.orig/src/mozilla.cpp galeon-0.11.3/src/mozilla.cpp ---- galeon-0.11.3.orig/src/mozilla.cpp Sat Jul 21 21:38:14 2001 -+++ galeon-0.11.3/src/mozilla.cpp Sat Aug 4 05:39:10 2001 -@@ -279,7 +279,7 @@ - nsresult result; - GaleonWrapper *wrapper = (GaleonWrapper *)(embed->wrapper); - -- NS_WITH_SERVICE(nsIPrintOptions, options, kPrintOptionsCID, &result); -+ nsCOMPtr options = do_GetService(kPrintOptionsCID, &result); - if (NS_FAILED(result)) return NS_ERROR_FAILURE; - - if (info->pages) diff --git a/galeon.spec b/galeon.spec deleted file mode 100644 index 4afa107..0000000 --- a/galeon.spec +++ /dev/null @@ -1,87 +0,0 @@ -Summary: Galeon - gecko-based GNOME web browser -Summary(pl): Galeon - przegl±darka WWW dla GNOME -Name: galeon -Version: 0.12pre1 -Release: 1 -License: GPL -Group: X11/Applications/Networking -Group(de): X11/Applikationen/Netzwerkwesen -Group(pl): X11/Aplikacje/Sieciowe -Source0: http://prdownloads.sourceforge.net/galeon/%{name}-%{version}.tar.gz -#Patch0: %{name}-mozilla_five_home.patch -#Patch1: %{name}-ns-with-service.patch -URL: http://galeon.sourceforge.net/ -Requires: mozilla-embedded >= 0.9.3-1 -BuildRequires: GConf-devel >= 1.0.3-2 -BuildRequires: ORBit-devel >= 0.5.0 -BuildRequires: gettext-devel -BuildRequires: gnome-core-devel >= 1.2.0 -BuildRequires: gnome-libs-devel >= 1.2.0 -BuildRequires: gnome-vfs-devel >= 0.5 -BuildRequires: libxml-devel >= 1.8.7 -BuildRequires: libglade-devel -BuildRequires: libstdc++-devel -BuildRequires: mozilla-devel >= 0.9.3-1 -BuildRequires: oaf >= 0.6.2 -BuildRequires: oaf-devel >= 0.6.2 -BuildRequires: gdk-pixbuf-devel >= 0.10. -BuildRequires: bison -BuildRequires: xml-i18n-tools -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - -%description -Gnome browser based on Gecko (Mozilla rendering engine). - -%description -l pl -Galeon jest przegl±dark± WWW bazuj±c± na Gecko (mechanizmie -interpretacji stron Mozilli). - -%prep -%setup -q -#%patch0 -p1 -#%patch1 -p1 - -%build -%configure2_13 \ - --with-mozilla-libs=%{_libdir} \ - --with-mozilla-includes=%{_includedir}/mozilla \ - --with-mozilla-home=%{_libdir}/mozilla \ - --enable-nls \ - --disable-included-gettext \ - --sysconfdir=%{_sysconfdir}/X11/GNOME - -%{__make} - -%install -rm -rf $RPM_BUILD_ROOT - -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - Networkdir=%{_applnkdir}/Network/WWW - -mv -f $RPM_BUILD_ROOT%{_bindir}/galeon-bin $RPM_BUILD_ROOT%{_bindir}/galeon - -gzip -9nf AUTHORS ChangeLog NEWS README - -%find_lang %{name} --with-gnome - -%post -umask 022 -rm -f %{_libdir}/mozilla/component.reg -MOZILLA_FIVE_HOME=%{_libdir}/mozilla regxpcom - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -f %{name}.lang -%defattr(644,root,root,755) -%doc *.gz -%attr(755,root,root) %{_bindir}/* -%{_applnkdir}/Network/WWW/* -%{_datadir}/galeon -%{_datadir}/oaf/* -%{_datadir}/sounds/galeon -%{_pixmapsdir}/* -- 2.44.0