Attachment 41525 Details for Bug 64973 – screem.diff

[patch] screem.diff

screem.diff (text/plain), 14.78 KB, created by Jeremy Messenger on 2004-03-31 19:37:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Messenger

Created: 2004-03-31 19:37:23 UTC

Size: 14.78 KB

patch

obsolete

>diff -ur screem.orig/Makefile screem/Makefile
>--- screem.orig/Makefile	Sun Mar 14 00:17:34 2004
>+++ screem/Makefile	Wed Mar 31 12:31:06 2004
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	screem
>-PORTVERSION=	0.8.2
>-PORTREVISION=	1
>+PORTVERSION=	0.10.1
> CATEGORIES=	www gnome
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -15,14 +14,15 @@
> MAINTAINER=	coop9211@uidaho.edu
> COMMENT=	Nice GNOME/GTK-based HTML editor
> 
>-LIB_DEPENDS+=	neon.24:${PORTSDIR}/www/neon
>+LIB_DEPENDS+=	neon.24:${PORTSDIR}/www/neon \
>+		croco.2:${PORTSDIR}/textproc/libcroco
> 
> USE_GMAKE=	yes
> USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_XPM=	yes
> USE_GNOME=	gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml \
>-		gtksourceview
>+		gtksourceview lthack intlhack
> USE_LIBTOOL_VER=13
> INSTALLS_SHLIB=	yes
> 
>@@ -38,10 +38,8 @@
> #			--with-neon="${LOCALBASE}/lib"
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
>-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
>-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|\@GNOME_DATA_PREFIX\@|\$$$datadir$|g'
>+	@${REINPLACE_CMD} -e 's|\$${DATADIRNAME}/\$${PACKAGE}/pixmaps|\$${DATADIRNAME}/gnome/\$${PACKAGE}/pixmaps|g' \
>+		${WRKSRC}/configure
> 
> post-configure:
> 	@${REINPLACE_CMD} -e 's|\/\* #undef HAVE_LIMITS_H \*\/|#define HAVE_LIMITS_H 1|g' ${WRKSRC}/config.h
>diff -ur screem.orig/distinfo screem/distinfo
>--- screem.orig/distinfo	Sun Feb  8 01:55:37 2004
>+++ screem/distinfo	Wed Mar 31 12:28:05 2004
>@@ -1,2 +1,2 @@
>-MD5 (screem-0.8.2.tar.gz) = fd1c6f8c2867a43028621cbdd944b9df
>-SIZE (screem-0.8.2.tar.gz) = 2193840
>+MD5 (screem-0.10.1.tar.gz) = 20b21890be18654b9e7b20e111a65a5c
>+SIZE (screem-0.10.1.tar.gz) = 2350120
>diff -ur screem.orig/files/patch-ltmain.sh screem/files/patch-ltmain.sh
>--- screem.orig/files/patch-ltmain.sh	Sat Nov  1 16:25:23 2003
>+++ screem/files/patch-ltmain.sh	Wed Mar 31 12:28:05 2004
>@@ -1,6 +1,6 @@
>---- ltmain.sh.orig	Fri Sep 12 14:51:51 2003
>-+++ ltmain.sh	Sun Sep 21 17:49:07 2003
>-@@ -1280,7 +1280,7 @@
>+--- ltmain.sh.orig	Tue Mar 30 22:36:08 2004
>++++ ltmain.sh	Tue Mar 30 22:39:04 2004
>+@@ -1360,7 +1360,7 @@
>  	  esac
>  	elif test "X$arg" = "X-lc_r"; then
>  	 case $host in
>@@ -9,7 +9,7 @@
>  	   # Do not include libc_r directly, use -pthread flag.
>  	   continue
>  	   ;;
>-@@ -1290,8 +1290,16 @@
>+@@ -1370,8 +1370,16 @@
>  	continue
>  	;;
>  
>@@ -26,7 +26,7 @@
>  	continue
>  	;;
>  
>-@@ -3000,6 +3008,9 @@
>+@@ -3110,6 +3118,9 @@
>  	    # problems, so we reset it completely
>  	    verstring=
>  	    ;;
>@@ -36,7 +36,7 @@
>  	  *)
>  	    verstring="0.0"
>  	    ;;
>-@@ -5428,10 +5439,12 @@
>+@@ -5712,10 +5723,12 @@
>  	fi
>  
>  	# Install the pseudo-library for information purposes.
>diff -ur screem.orig/files/patch-plugins::uploadWizard::Makefile.in screem/files/patch-plugins::uploadWizard::Makefile.in
>--- screem.orig/files/patch-plugins::uploadWizard::Makefile.in	Sun Feb  8 01:55:38 2004
>+++ screem/files/patch-plugins::uploadWizard::Makefile.in	Wed Mar 31 12:28:05 2004
>@@ -1,20 +1,22 @@
>---- plugins/uploadWizard/Makefile.in.old	Sat Jan 31 01:09:09 2004
>-+++ plugins/uploadWizard/Makefile.in	Sat Jan 31 01:14:46 2004
>-@@ -179,7 +179,7 @@
>+--- plugins/uploadWizard/Makefile.in.orig	Tue Mar 30 22:42:31 2004
>++++ plugins/uploadWizard/Makefile.in	Tue Mar 30 22:43:33 2004
>+@@ -267,8 +267,8 @@
>+ 			localdriver.c
>  
>  
>- uploadWizard_la_LDFLAGS = -avoid-version -module
>--uploadWizard_la_LIBADD = $(NEONOBJS) 
>-+uploadWizard_la_LIBADD = 
>+-uploadWizard_la_LDFLAGS = -avoid-version -module $(NEON_CFLAGS)
>+-uploadWizard_la_LIBADD = $(NEONOBJS) $(NEON_LIBS) 
>++uploadWizard_la_LDFLAGS = -avoid-version -module
>++uploadWizard_la_LIBADD =  
>  
>  config_h = $(top_builddir)/config.h
>  obj_ext = o
>-@@ -191,7 +191,7 @@
>+@@ -279,7 +279,7 @@
>+ CONFIG_CLEAN_FILES =
>+ LTLIBRARIES = $(plugins_exec_LTLIBRARIES)
>  
>- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
>- LIBS = @LIBS@
>--uploadWizard_la_DEPENDENCIES =  $(neon_dir)/*.lo
>-+uploadWizard_la_DEPENDENCIES =  
>- @HAVE_FNMATCH_FALSE@uploadWizard_la_OBJECTS =  netrc.lo rpmatch.lo \
>- @HAVE_FNMATCH_FALSE@fnmatch.lo common.lo davdriver.lo fileset.lo ftp.lo \
>- @HAVE_FNMATCH_FALSE@ftpdriver.lo rcfile.lo rshdriver.lo sitefiles.lo \
>+-uploadWizard_la_DEPENDENCIES = $(neon_dir)/*.lo
>++uploadWizard_la_DEPENDENCIES = 
>+ am__uploadWizard_la_SOURCES_DIST = basename.h netrc.c netrc.h rpmatch.c \
>+ 	fnmatch.c fnmatch.h common.c common.h davdriver.c fileset.c \
>+ 	fileset.h frontend.h ftp.c ftp.h ftpdriver.c i18n.h protocol.h \
>diff -ur screem.orig/pkg-descr screem/pkg-descr
>--- screem.orig/pkg-descr	Tue Nov 13 07:01:04 2001
>+++ screem/pkg-descr	Wed Mar 31 12:29:48 2004
>@@ -8,4 +8,4 @@
> 
> WWW: http://www.screem.org/
> 
>--- John Merryweather Cooper <jmcoopr@webmail.bmi.net>
>+-- John Merryweather Cooper <coop9211@uidaho.edu>
>diff -ur screem.orig/pkg-plist screem/pkg-plist
>--- screem.orig/pkg-plist	Mon Nov 10 11:05:13 2003
>+++ screem/pkg-plist	Wed Mar 31 12:28:05 2004
>@@ -15,6 +15,7 @@
> etc/gconf/schemas/screem.schemas
> lib/screem/plugins/colourWizard.so
> lib/screem/plugins/cssWizard.so
>+lib/screem/plugins/css_wizard.so
> lib/screem/plugins/entityWizard.so
> lib/screem/plugins/formWizard.so
> lib/screem/plugins/imageWizard.so
>@@ -30,6 +31,7 @@
> share/gnome/mime-info/screem.keys
> share/gnome/mime-info/screem.mime
> share/gnome/omf/screem/screem-C.omf
>+@exec scrollkeeper-install -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true
> share/gnome/pixmaps/screem.png
> share/gnome/pixmaps/screem/splash/splash.png
> share/gnome/screem/dtd/HTMLlat1.ent
>@@ -42,15 +44,17 @@
> share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-frameset.dtd
> share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-strict.dtd
> share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-transitional.dtd
>+share/gnome/screem/dtd/screem-tagtree-config.dtd
> share/gnome/screem/dtd/screem-tagtree.dtd
> share/gnome/screem/dtd/xhtml-lat1.ent
> share/gnome/screem/dtd/xhtml-special.ent
> share/gnome/screem/dtd/xhtml-symbol.ent
> share/gnome/screem/features.xml
>+share/gnome/screem/glade/css-wizard.glade
> share/gnome/screem/glade/css.glade
> share/gnome/screem/glade/entityWizard.glade
> share/gnome/screem/glade/imageWizard.glade
>-share/gnome/screem/glade/linkWizard.glade
>+share/gnome/screem/glade/linkwizard.glade
> share/gnome/screem/glade/screem.glade
> share/gnome/screem/glade/ssiwizard.glade
> share/gnome/screem/glade/tablewizard.glade
>@@ -59,6 +63,58 @@
> share/gnome/screem/hints/screem_hints_fr.txt
> share/gnome/screem/hints/screem_hints_pt_BR.txt
> share/gnome/screem/hints/screem_hints_sv.txt
>+share/gnome/screem/pixmaps/add-link-16.png
>+share/gnome/screem/pixmaps/add-link-24.png
>+share/gnome/screem/pixmaps/add_column-16.png
>+share/gnome/screem/pixmaps/add_column-24.png
>+share/gnome/screem/pixmaps/add_row-16.png
>+share/gnome/screem/pixmaps/add_row-24.png
>+share/gnome/screem/pixmaps/bookmarks-open.png
>+share/gnome/screem/pixmaps/bookmarks-preferences.png
>+share/gnome/screem/pixmaps/browser.xpm
>+share/gnome/screem/pixmaps/button.xpm
>+share/gnome/screem/pixmaps/caption.xpm
>+share/gnome/screem/pixmaps/checkbutton.xpm
>+share/gnome/screem/pixmaps/cvs-add-16.png
>+share/gnome/screem/pixmaps/cvs-add-24.png
>+share/gnome/screem/pixmaps/cvs-add.png
>+share/gnome/screem/pixmaps/cvs-checkout-16.png
>+share/gnome/screem/pixmaps/cvs-checkout-24.png
>+share/gnome/screem/pixmaps/cvs-checkout.png
>+share/gnome/screem/pixmaps/cvs-commit-16.png
>+share/gnome/screem/pixmaps/cvs-commit-24.png
>+share/gnome/screem/pixmaps/cvs-remove-16.png
>+share/gnome/screem/pixmaps/cvs-remove-24.png
>+share/gnome/screem/pixmaps/cvs-remove.png
>+share/gnome/screem/pixmaps/cvs-update-16.png
>+share/gnome/screem/pixmaps/cvs-update-24.png
>+share/gnome/screem/pixmaps/cvs-update.png
>+share/gnome/screem/pixmaps/entry.xpm
>+share/gnome/screem/pixmaps/fixed.xpm
>+share/gnome/screem/pixmaps/gallery.xpm
>+share/gnome/screem/pixmaps/gnome-fileentry.xpm
>+share/gnome/screem/pixmaps/insert-symbol-16.png
>+share/gnome/screem/pixmaps/insert-symbol-24.png
>+share/gnome/screem/pixmaps/optionmenu.xpm
>+share/gnome/screem/pixmaps/paragraphs.png
>+share/gnome/screem/pixmaps/pre.xpm
>+share/gnome/screem/pixmaps/radiobutton.xpm
>+share/gnome/screem/pixmaps/resources.png
>+share/gnome/screem/pixmaps/screem_site.png
>+share/gnome/screem/pixmaps/site_preview.png
>+share/gnome/screem/pixmaps/site_structure-48.png
>+share/gnome/screem/pixmaps/stock_connect.png
>+share/gnome/screem/pixmaps/stock_disconnect.png
>+share/gnome/screem/pixmaps/stock_insert_image-16.png
>+share/gnome/screem/pixmaps/stock_insert_image.png
>+share/gnome/screem/pixmaps/stock_insert_table-16.png
>+share/gnome/screem/pixmaps/sub.xpm
>+share/gnome/screem/pixmaps/sup.xpm
>+share/gnome/screem/pixmaps/td.xpm
>+share/gnome/screem/pixmaps/text.xpm
>+share/gnome/screem/pixmaps/th.xpm
>+share/gnome/screem/pixmaps/todo.png
>+share/gnome/screem/pixmaps/tr.xpm
> share/gnome/screem/resources/Images/made.jpg
> share/gnome/screem/resources/Javascript/linktitle.js
> share/gnome/screem/resources/Javascript/preload.js
>@@ -75,124 +131,27 @@
> share/gnome/screem/ui/screem-window-menu.xml
> share/gnome/screem/ui/screem-window-popups.xml
> share/gnome/screem/ui/screem-window-toolbar.xml
>-share/locale/az.mo/LC_MESSAGES/screem.mo
>-share/locale/cs.mo/LC_MESSAGES/screem.mo
>-share/locale/da.mo/LC_MESSAGES/screem.mo
>-share/locale/de.mo/LC_MESSAGES/screem.mo
>-share/locale/el.mo/LC_MESSAGES/screem.mo
>-share/locale/es.mo/LC_MESSAGES/screem.mo
>-share/locale/fr.mo/LC_MESSAGES/screem.mo
>-share/locale/it.mo/LC_MESSAGES/screem.mo
>-share/locale/ja.mo/LC_MESSAGES/screem.mo
>-share/locale/ko.mo/LC_MESSAGES/screem.mo
>-share/locale/nb.mo/LC_MESSAGES/screem.mo
>-share/locale/no.mo/LC_MESSAGES/screem.mo
>-share/locale/pl.mo/LC_MESSAGES/screem.mo
>-share/locale/pt_BR.mo/LC_MESSAGES/screem.mo
>-share/locale/ru.mo/LC_MESSAGES/screem.mo
>-share/locale/sk.mo/LC_MESSAGES/screem.mo
>-share/locale/sv.mo/LC_MESSAGES/screem.mo
>-share/locale/tr.mo/LC_MESSAGES/screem.mo
>-share/locale/uk.mo/LC_MESSAGES/screem.mo
>-share/locale/vi.mo/LC_MESSAGES/screem.mo
>-share/locale/zh_CN.mo/LC_MESSAGES/screem.mo
>-share/screem/pixmaps/add-link-16.png
>-share/screem/pixmaps/add-link-24.png
>-share/screem/pixmaps/add_column-16.png
>-share/screem/pixmaps/add_column-24.png
>-share/screem/pixmaps/add_row-16.png
>-share/screem/pixmaps/add_row-24.png
>-share/screem/pixmaps/bookmarks-open.png
>-share/screem/pixmaps/bookmarks-preferences.png
>-share/screem/pixmaps/browser.xpm
>-share/screem/pixmaps/button.xpm
>-share/screem/pixmaps/caption.xpm
>-share/screem/pixmaps/checkbutton.xpm
>-share/screem/pixmaps/cvs-add-16.png
>-share/screem/pixmaps/cvs-add-24.png
>-share/screem/pixmaps/cvs-add.png
>-share/screem/pixmaps/cvs-checkout-16.png
>-share/screem/pixmaps/cvs-checkout-24.png
>-share/screem/pixmaps/cvs-checkout.png
>-share/screem/pixmaps/cvs-commit-16.png
>-share/screem/pixmaps/cvs-commit-24.png
>-share/screem/pixmaps/cvs-remove-16.png
>-share/screem/pixmaps/cvs-remove-24.png
>-share/screem/pixmaps/cvs-remove.png
>-share/screem/pixmaps/cvs-update-16.png
>-share/screem/pixmaps/cvs-update-24.png
>-share/screem/pixmaps/cvs-update.png
>-share/screem/pixmaps/entry.xpm
>-share/screem/pixmaps/fixed.xpm
>-share/screem/pixmaps/gallery.xpm
>-share/screem/pixmaps/gnome-fileentry.xpm
>-share/screem/pixmaps/insert-symbol-16.png
>-share/screem/pixmaps/insert-symbol-24.png
>-share/screem/pixmaps/optionmenu.xpm
>-share/screem/pixmaps/paragraphs.png
>-share/screem/pixmaps/pre.xpm
>-share/screem/pixmaps/radiobutton.xpm
>-share/screem/pixmaps/resources.png
>-share/screem/pixmaps/screem_site.png
>-share/screem/pixmaps/site_preview.png
>-share/screem/pixmaps/site_structure-48.png
>-share/screem/pixmaps/stock_connect.png
>-share/screem/pixmaps/stock_disconnect.png
>-share/screem/pixmaps/stock_insert_image-16.png
>-share/screem/pixmaps/stock_insert_image.png
>-share/screem/pixmaps/stock_insert_table-16.png
>-share/screem/pixmaps/sub.xpm
>-share/screem/pixmaps/sup.xpm
>-share/screem/pixmaps/td.xpm
>-share/screem/pixmaps/text.xpm
>-share/screem/pixmaps/th.xpm
>-share/screem/pixmaps/todo.png
>-share/screem/pixmaps/tr.xpm
>-@dirrm share/screem/pixmaps
>-@dirrm share/screem
>-@dirrm share/locale/zh_CN.mo/LC_MESSAGES
>-@dirrm share/locale/zh_CN.mo
>-@dirrm share/locale/vi.mo/LC_MESSAGES
>-@dirrm share/locale/vi.mo
>-@dirrm share/locale/uk.mo/LC_MESSAGES
>-@dirrm share/locale/uk.mo
>-@dirrm share/locale/tr.mo/LC_MESSAGES
>-@dirrm share/locale/tr.mo
>-@dirrm share/locale/sv.mo/LC_MESSAGES
>-@dirrm share/locale/sv.mo
>-@dirrm share/locale/sk.mo/LC_MESSAGES
>-@dirrm share/locale/sk.mo
>-@dirrm share/locale/ru.mo/LC_MESSAGES
>-@dirrm share/locale/ru.mo
>-@dirrm share/locale/pt_BR.mo/LC_MESSAGES
>-@dirrm share/locale/pt_BR.mo
>-@dirrm share/locale/pl.mo/LC_MESSAGES
>-@dirrm share/locale/pl.mo
>-@dirrm share/locale/no.mo/LC_MESSAGES
>-@dirrm share/locale/no.mo
>-@dirrm share/locale/nb.mo/LC_MESSAGES
>-@dirrm share/locale/nb.mo
>-@dirrm share/locale/ko.mo/LC_MESSAGES
>-@dirrm share/locale/ko.mo
>-@dirrm share/locale/ja.mo/LC_MESSAGES
>-@dirrm share/locale/ja.mo
>-@dirrm share/locale/it.mo/LC_MESSAGES
>-@dirrm share/locale/it.mo
>-@dirrm share/locale/fr.mo/LC_MESSAGES
>-@dirrm share/locale/fr.mo
>-@dirrm share/locale/es.mo/LC_MESSAGES
>-@dirrm share/locale/es.mo
>-@dirrm share/locale/el.mo/LC_MESSAGES
>-@dirrm share/locale/el.mo
>-@dirrm share/locale/de.mo/LC_MESSAGES
>-@dirrm share/locale/de.mo
>-@dirrm share/locale/da.mo/LC_MESSAGES
>-@dirrm share/locale/da.mo
>-@dirrm share/locale/cs.mo/LC_MESSAGES
>-@dirrm share/locale/cs.mo
>-@dirrm share/locale/az.mo/LC_MESSAGES
>-@dirrm share/locale/az.mo
>-@dirrm share/locale
>+share/locale/az/LC_MESSAGES/screem.mo
>+share/locale/cs/LC_MESSAGES/screem.mo
>+share/locale/da/LC_MESSAGES/screem.mo
>+share/locale/de/LC_MESSAGES/screem.mo
>+share/locale/el/LC_MESSAGES/screem.mo
>+share/locale/es/LC_MESSAGES/screem.mo
>+share/locale/fr/LC_MESSAGES/screem.mo
>+share/locale/it/LC_MESSAGES/screem.mo
>+share/locale/ja/LC_MESSAGES/screem.mo
>+share/locale/ko/LC_MESSAGES/screem.mo
>+share/locale/nb/LC_MESSAGES/screem.mo
>+share/locale/no/LC_MESSAGES/screem.mo
>+share/locale/pl/LC_MESSAGES/screem.mo
>+share/locale/pt_BR/LC_MESSAGES/screem.mo
>+share/locale/ru/LC_MESSAGES/screem.mo
>+share/locale/sk/LC_MESSAGES/screem.mo
>+share/locale/sv/LC_MESSAGES/screem.mo
>+share/locale/tr/LC_MESSAGES/screem.mo
>+share/locale/uk/LC_MESSAGES/screem.mo
>+share/locale/vi/LC_MESSAGES/screem.mo
>+share/locale/zh_CN/LC_MESSAGES/screem.mo
> @dirrm share/gnome/screem/ui
> @dirrm share/gnome/screem/tagtrees
> @dirrm share/gnome/screem/resources/Templates
>@@ -202,6 +161,7 @@
> @dirrm share/gnome/screem/resources/HTML
> @dirrm share/gnome/screem/resources/Applets
> @dirrm share/gnome/screem/resources
>+@dirrm share/gnome/screem/pixmaps
> @dirrm share/gnome/screem/hints
> @dirrm share/gnome/screem/glade
> @dirrm share/gnome/screem/dtd
>@@ -227,5 +187,4 @@
> @dirrm etc/gconf/gconf.xml.defaults/apps/screem/editor/print
> @dirrm etc/gconf/gconf.xml.defaults/apps/screem/editor
> @dirrm etc/gconf/gconf.xml.defaults/apps/screem
>-@exec scrollkeeper-install -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true
> @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true

Actions: View | Diff

Attachments on bug 64973: 41524 | 41525