Attachment 113137 Details for Bug 154669 – file.diff

[patch] file.diff

file.diff (text/plain), 7.94 KB, created by Armin Pirkovitsch on 2011-02-11 05:00:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Armin Pirkovitsch

Created: 2011-02-11 05:00:20 UTC

Size: 7.94 KB

patch

obsolete

>diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/editors/textroom/Makefile editors/textroom/Makefile
>--- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/editors/textroom/Makefile	2010-05-31 05:38:22.000000000 +0200
>+++ editors/textroom/Makefile	2011-02-11 05:54:22.000000000 +0100
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	textroom
>-PORTVERSION=	0.6.5
>+PORTVERSION=	0.8.2
> CATEGORIES=	editors
> MASTER_SITES=	SF
> 
>@@ -14,21 +14,22 @@
> COMMENT=	A full screen text editor
> 
> BUILD_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
>-LIB_DEPENDS=	hunspell-1.2:${PORTSDIR}/hungarian/hunspell
>+LIB_DEPENDS=	hunspell-1.2:${PORTSDIR}/hungarian/hunspell \
>+		xml++-2.6.2:${PORTSDIR}/textproc/libxml++26 \
>+		curl.6:${PORTSDIR}/ftp/curl
> RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
> 
> USE_SDL=	mixer
> USE_QT_VER=	4
>-QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build corelib gui
>+QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build corelib gui xml \
>+		svg opengl qt3support
> QMAKE_ARGS=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
> HAS_CONFIGURE=	yes
> MAKE_JOBS_SAFE=	yes
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|-lhunspell|-lhunspell-1.2|' \
>-		${WRKSRC}/textroom.pro
> 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
>-		${WRKSRC}/src/textroom.cpp
>+		${WRKSRC}/application/src/textroom.cpp
> 
> do-configure:
> 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
>diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/editors/textroom/distinfo editors/textroom/distinfo
>--- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/editors/textroom/distinfo	2010-05-31 05:38:22.000000000 +0200
>+++ editors/textroom/distinfo	2011-02-09 21:34:09.000000000 +0100
>@@ -1,3 +1,2 @@
>-MD5 (textroom-0.6.5.tar.gz) = 940ed9475c260264ecf84edf72bb095a
>-SHA256 (textroom-0.6.5.tar.gz) = 3fd482e5226e020699e068fb5f310f5666606f9ae5ee3a8d5aafe55ec5c45c6a
>-SIZE (textroom-0.6.5.tar.gz) = 4937444
>+SHA256 (textroom-0.8.2.tar.gz) = f051523c9d5c57bb986f42eb9026c842e7946cec5c865ca62524a4a1379327b2
>+SIZE (textroom-0.8.2.tar.gz) = 5906777
>diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/editors/textroom/files/patch-application_application.pro editors/textroom/files/patch-application_application.pro
>--- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/editors/textroom/files/patch-application_application.pro	1970-01-01 01:00:00.000000000 +0100
>+++ editors/textroom/files/patch-application_application.pro	2011-02-10 21:37:41.000000000 +0100
>@@ -0,0 +1,80 @@
>+--- application/application.pro.orig	2011-01-22 03:25:20.000000000 +0100
>++++ application/application.pro	2011-02-10 21:37:18.000000000 +0100
>+@@ -4,19 +4,20 @@
>+     src \
>+     ui
>+ 
>+-linux-g++ {
>++freebsd-g++ {
>+ 	INCLUDEPATH += . \
>+ 	    src \
>+ 	    src/include \
>+-	    /usr/include \
>+-	    /usr/include/hunspell \
>+-	    /usr/include/libxml++-2.6 \
>+-	    /usr/include/glibmm-2.4 \
>+-	    /usr/lib/glibmm-2.4/include \
>+-	    /usr/include/glib-2.0 \
>+-	    /usr/lib/glib-2.0/include \
>+-	    /usr/lib/libxml++-2.6/include \
>+-	    /usr/include/SDL
>++	    $$LOCALBASE/include \
>++	    $$LOCALBASE/include/hunspell \
>++	    $$LOCALBASE/include/libxml++-2.6 \
>++	    $$LOCALBASE/include//libxml++-2.6/include \
>++	    $$LOCALBASE/include/glibmm-2.4 \
>++	    $$LOCALBASE/lib/glibmm-2.4/include \
>++	    $$LOCALBASE/include/glib-2.0 \
>++	    $$LOCALBASE/lib/glib-2.0/include \
>++	    $$LOCALBASE/lib/libxml++-2.6/include \
>++	    $$LOCALBASE/include/SDL
>+ 	
>+ }
>+ 
>+@@ -85,7 +86,7 @@
>+     src/asciireporter.cpp
>+ RESOURCES += resource/textroom.qrc \
>+ 	resource/images/icons-app.qrc 
>+-linux-g++ {
>++freebsd-g++ {
>+     CONFIG += release \
>+         build_all
>+     INSTALLS += data \
>+@@ -98,27 +99,27 @@
>+         icon
>+     LIBS = -lSDL_mixer \
>+ 	-lSDL \
>+-        -lhunspell \
>++	-lhunspell-1.2 \
>+ 	-lglibmm-2.4 \
>+ 	-lcurl \
>+ 	-lxml++-2.6 \
>+ 	$$TOPDIR/lib/libflo.a
>+-    data.path = /usr/share/sounds
>++    data.path = $$PREFIX/share/sounds
>+     data.files = resource/sounds/*
>+-    target.path = /usr/bin
>+-    words.path = /usr/share/textroom
>++    target.path = $$PREFIX/bin
>++    words.path = $$PREFIX/share/textroom
>+     words.files = resource/words.txt
>+-    desktop.path = /usr/share/applications
>++    desktop.path = $$PREFIX/share/applications
>+     desktop.files = resource/desktop/textroom.desktop
>+-    doc-icon.path = /usr/share/textroom
>++    doc-icon.path = $$PREFIX/share/textroom
>+     doc-icon.files = resource/images/textroom-doc.png
>+-    mime.path = /usr/share/textroom
>++    mime.path = $$PREFIX/share/textroom
>+     mime.files = resource/desktop/textroom-txr-mime.xml
>+-    uninstaller.path = /usr/bin
>++    uninstaller.path = $$PREFIX/bin
>+     uninstaller.files = resource/desktop/textroom-uninstall
>+-    dict.path = /usr/share/hunspell
>++    dict.path = $$PREFIX/share/hunspell
>+     dict.files = resource/dict/*
>+-    icon.path = /usr/share/pixmaps
>++    icon.path = $$PREFIX/share/pixmaps
>+     icon.files = resource/images/textroom.png
>+ }
>+ 
>diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/editors/textroom/files/patch-textroom.pro editors/textroom/files/patch-textroom.pro
>--- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/editors/textroom/files/patch-textroom.pro	2010-05-02 08:21:22.000000000 +0200
>+++ editors/textroom/files/patch-textroom.pro	1970-01-01 01:00:00.000000000 +0100
>@@ -1,54 +0,0 @@
>---- ./textroom.pro.orig	2010-04-21 18:41:54.000000000 +0400
>-+++ ./textroom.pro	2010-05-01 02:27:57.894111731 +0400
>-@@ -7,9 +7,9 @@
>- INCLUDEPATH += . \
>-     src \
>-     src/include \
>--    /usr/include \
>--    /usr/include/hunspell \
>--    /usr/include/SDL
>-+    $$LOCALBASE/include \
>-+    $$LOCALBASE/include/hunspell \
>-+    $$LOCALBASE/include/SDL
>- DESTDIR += .
>- OBJECTS_DIR += temp
>- MOC_DIR += temp
>-@@ -40,7 +40,6 @@
>-     dict \
>-     target \
>-     desktop \
>--    uninstaller \
>-     mime \
>-     icon
>- LIBS = -lSDL \
>-@@ -50,22 +49,19 @@
>- QT += core \
>-     gui
>- 
>--data.path = /usr/share/sounds
>-+data.path = $$PREFIX/share/sounds
>- data.files = resource/sounds/*
>--target.path = /usr/bin
>--desktop.path = /usr/share/applications
>-+target.path = $$PREFIX/bin
>-+desktop.path = $$PREFIX/share/applications
>- desktop.files = resource/desktop/textroom.desktop
>--doc-icon.path = /usr/share/textroom
>-+doc-icon.path = $$PREFIX/share/textroom
>- doc-icon.files = resource/images/textroom-doc.png
>--mime.path = /usr/share/textroom
>-+mime.path = $$PREFIX/share/mime/packages
>- mime.files = resource/desktop/textroom-txr-mime.xml
>--uninstaller.path = /usr/bin
>-+uninstaller.path = $$PREFIX/bin
>- uninstaller.files = resource/desktop/textroom-uninstall
>--dict.path = /usr/share/myspell/dicts
>-+dict.path = $$PREFIX/share/myspell/dicts
>- dict.files = resource/dict/*
>--icon.path = /usr/share/pixmaps
>-+icon.path = $$PREFIX/share/pixmaps
>- icon.files = resource/images/textroom.png
>- 
>--unix:system(xdg-icon-resource install --context mimetypes --size 48 ./resource/images/textroom-doc.png application/x-txr)
>--unix:system(xdg-mime install ./resource/desktop/textroom-txr-mime.xml)
>--unix:system(xdg-mime default textroom.desktop application/x-txr)	
>diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/editors/textroom/pkg-plist editors/textroom/pkg-plist
>--- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/editors/textroom/pkg-plist	2010-05-02 08:21:22.000000000 +0200
>+++ editors/textroom/pkg-plist	2011-02-10 22:08:50.000000000 +0100
>@@ -1,16 +1,16 @@
> bin/textroom
>+bin/textroom-uninstall
> share/applications/textroom.desktop
>-share/mime/packages/textroom-txr-mime.xml
>-share/myspell/dicts/tr.aff
>-share/myspell/dicts/tr.dic
>+share/textroom/textroom-txr-mime.xml
>+share/textroom/words.txt
>+share/hunspell/tr.aff
>+share/hunspell/tr.dic
> share/pixmaps/textroom.png
> share/sounds/keyany.wav
> share/sounds/keyenter.wav
> @dirrmtry share/sounds
>-@dirrmtry share/myspell/dicts
>-@dirrmtry share/myspell
>-@dirrmtry share/mime/packages
>-@dirrmtry share/mime
>+@dirrmtry share/hunspell
> @dirrmtry share/applications
>+@dirrm share/textroom
> @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
> @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true

Actions: View | Diff

Attachments on bug 154669: 113137 | 113138