Attachment #111372 for bug #152619

View | Details | Raw Unified | Return to bug 152619
Collapse All | Expand All

Lines 7-13 Link Here

(-)/home/corn/devel/qnapi/Makefile (-3 / +7 lines)
7		7
8	PORTNAME= qnapi	8	PORTNAME= qnapi
9	PORTVERSION= 0.1.5	9	PORTVERSION= 0.1.5
10	PORTREVISION= 2	10	PORTREVISION= 3
11	CATEGORIES= polish multimedia	11	CATEGORIES= polish multimedia
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}	12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
13		13
Lines 16-23 Link Here
16		16
17	RUN_DEPENDS= 7z:${PORTSDIR}/archivers/p7zip	17	RUN_DEPENDS= 7z:${PORTSDIR}/archivers/p7zip
18		18
		19	LICENSE= GPLv2
		20
19	USE_QT_VER= 4	21	USE_QT_VER= 4
20	QT_COMPONENTS= corelib gui network qmake_build moc_build uic_build rcc_build	22	QT_COMPONENTS= corelib gui network qmake_build moc_build uic_build rcc_build
		23	MAKE_JOBS_SAFE= yes
21	INSTALLS_ICONS= yes	24	INSTALLS_ICONS= yes
22		25
23	MAN1= qnapi.1	26	MAN1= qnapi.1
Lines 26-33 Link Here
26	LICENSE.pl COPYRIGHT	29	LICENSE.pl COPYRIGHT
27		30
28	post-patch:	31	post-patch:
29	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's\|@PREFIX@\|${PREFIX}\|g' qnapi.pro \	32	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's\|@PREFIX@\|${PREFIX}\|g' qnapi.pro
30	doc/qnapi.desktop doc/qnapi-download.desktop	33	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's\|@LOCALBASE@\|${LOCALBASE}\|g' \
		34	doc/qnapi.desktop doc/qnapi-download.desktop src/napi.h
31		35
32	pre-build:	36	pre-build:
33	@cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC}	37	@cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC}

Lines 1-3 Link Here

(-)/home/corn/devel/qnapi/distinfo (-1 lines)
1	MD5 (qnapi-0.1.5.tar.gz) = 503a34b4605507740bca5fbf6a20fbf8
2	SHA256 (qnapi-0.1.5.tar.gz) = 88ef9e4c8a2e830b0b9b231888e0012d10ac5ab3b8df7a18d09f42ee7de7fa5d	1	SHA256 (qnapi-0.1.5.tar.gz) = 88ef9e4c8a2e830b0b9b231888e0012d10ac5ab3b8df7a18d09f42ee7de7fa5d
3	SIZE (qnapi-0.1.5.tar.gz) = 172405	2	SIZE (qnapi-0.1.5.tar.gz) = 172405

Lines 1-11 Link Here

(-)/home/corn/devel/qnapi/files/patch-doc-qnapi.desktop (-4 / +4 lines)
1	--- doc/qnapi.desktop.orig Tue Feb 26 20:18:29 2008	1	--- doc/qnapi.desktop.orig 2008-05-22 11:50:43.000000000 +0200
2	+++ doc/qnapi.desktop Thu Apr 10 20:07:03 2008	2	+++ doc/qnapi.desktop 2010-11-27 12:26:57.000000000 +0100
3	@@ -1,7 +1,7 @@	3	@@ -1,7 +1,7 @@
4	[Desktop Entry]	4	[Desktop Entry]
5	Exec=qnapi	5	Exec=qnapi
6	Name=QNapi	6	Name=QNapi
7	-Icon=/usr/share/icons/qnapi-48.png	7	-Icon=/usr/share/icons/qnapi-48.png
8	+Icon=@PREFIX@/share/icons/qnapi.png	8	+Icon=@LOCALBASE@/share/icons/qnapi.png
9	Type=Application	9	Type=Application
10	Categories=Application;Multimedia;AudioVideo;Utility;Qt;	10	Categories=AudioVideo
11	Comment=Program do pobierania napisów do filmów	11	Comment=Program do pobierania napisów do filmów

Lines 1-11 Link Here

(-)/home/corn/devel/qnapi/files/patch-doc-qnapi_download.desktop (-4 / +4 lines)
1	--- doc/qnapi-download.desktop.orig Mon Apr 7 20:55:58 2008	1	--- doc/qnapi-download.desktop.orig 2008-04-07 20:55:58.000000000 +0200
2	+++ doc/qnapi-download.desktop Thu Apr 10 20:08:37 2008	2	+++ doc/qnapi-download.desktop 2010-11-27 12:24:23.000000000 +0100
3	@@ -4,7 +4,7 @@	3	@@ -4,7 +4,7 @@
4	Actions=QNapiDownload;	4	Actions=QNapiDownload;
5	Name=Pobierz napisy do filmu z QNapi	5	Name=Pobierz napisy do filmu z QNapi
6	GenericName=Pobierz napisy do filmu z QNapi	6	GenericName=Pobierz napisy do filmu z QNapi
7	-Icon=/usr/share/icons/qnapi-48.png	7	-Icon=/usr/share/icons/qnapi-48.png
8	+Icon=@PREFIX@/share/icons/qnapi.png	8	+Icon=@LOCALBASE@/share/icons/qnapi.png
9	ServiceTypes=video/x-msvideo,video/x-ms-asf,video/mpeg,video/x-ms-wmv,video/mp4,video/quicktime,video/x-theora,video/x-matroska,video/3gpp,application/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr	9	ServiceTypes=video/x-msvideo,video/x-ms-asf,video/mpeg,video/x-ms-wmv,video/mp4,video/quicktime,video/x-theora,video/x-matroska,video/3gpp,application/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr
10	X-KDE-ServiceTypes=KonqPopupMenu/Plugin	10	X-KDE-ServiceTypes=KonqPopupMenu/Plugin
11	Type=Service	11	Type=Service
Lines 14-17 Link Here
14	Name=Pobierz napisy do filmu z QNapi	14	Name=Pobierz napisy do filmu z QNapi
15	Exec=qnapi %F	15	Exec=qnapi %F
16	-Icon=/usr/share/icons/qnapi-48.png	16	-Icon=/usr/share/icons/qnapi-48.png
17	+Icon=@PREFIX@/share/icons/qnapi.png	17	+Icon=@LOCALBASE@/share/icons/qnapi.png

Lines 1-11 Link Here

(-)/home/corn/devel/qnapi/files/patch-doc-qnapi_download.schemas (-3 / +3 lines)
1	--- doc/qnapi-download.schemas.orig Sat Feb 23 11:31:20 2008	1	--- doc/qnapi-download.schemas.orig 2008-02-23 11:31:20.000000000 +0100
2	+++ doc/qnapi-download.schemas Thu Apr 10 20:11:23 2008	2	+++ doc/qnapi-download.schemas 2010-11-27 12:24:56.000000000 +0100
3	@@ -32,7 +32,7 @@	3	@@ -32,7 +32,7 @@
4	<short>The icon of the menu item</short>	4	<short>The icon of the menu item</short>
5	<long>The icon of the menu item that will appear next to the label in the Nautilus popup menu when the selection matches the appearance conditions settings</long>	5	<long>The icon of the menu item that will appear next to the label in the Nautilus popup menu when the selection matches the appearance conditions settings</long>
6	</locale>	6	</locale>
7	- <default>/usr/share/icons/qnapi.png</default>	7	- <default>/usr/share/icons/qnapi.png</default>
8	+ <default>@PREFIX@/share/icons/qnapi.png</default>	8	+ <default>@LOCALBASE@/share/icons/qnapi.png</default>
9	</schema>	9	</schema>
10	<schema>	10	<schema>
11	<key>/schemas/apps/nautilus-actions/configurations/12e76756-c203-4a27-830f-af5a1527869e/path</key>	11	<key>/schemas/apps/nautilus-actions/configurations/12e76756-c203-4a27-830f-af5a1527869e/path</key>




--- qnapi.pro.orig	2008-05-20 18:50:01.000000000 +0200
+++ qnapi.pro	2010-11-27 13:38:04.000000000 +0100
@@ -77,7 +77,7 @@
 #QMAKE_BUNDLE_DATA += 7ZIP_BINARY
 }

  target.path =  $${INSTALL_PREFIX}/bin
  doc.path =  $${INSTALL_PREFIX}/share/doc/$${TARGET}
  doc.files =  doc/ChangeLog \
@@ -89,27 +89,24 @@
   doc/COPYRIGHT \
   doc/qnapi-download.desktop \
   doc/qnapi-download.schemas

- desktop.path =  /usr/share/applications
+ desktop.path =  $${INSTALL_PREFIX}/share/applications
  desktop.files =  doc/$${TARGET}.desktop
  dolphin_integration.path =  /usr/share/apps/dolphin/servicemenus
+ dolphin_integration.path =  $${INSTALL_PREFIX}/share/apps/dolphin/servicemenus
  dolphin_integration.files =  doc/$${TARGET}-download.desktop
  d3lphin_integration.path =  /usr/share/apps/d3lphin/servicemenus
+ d3lphin_integration.path =  $${INSTALL_PREFIX}/share/apps/d3lphin/servicemenus
  d3lphin_integration.files =  doc/$${TARGET}-download.desktop
- konqueror_integration.path =  /usr/share/apps/konqueror/servicemenus
+ konqueror_integration.path =  $${INSTALL_PREFIX}/share/apps/konqueror/servicemenus
  konqueror_integration.files =  doc/$${TARGET}-download.desktop
- kde4_integration.path =  /usr/lib/kde4/share/kde4/services/ServiceMenus
+ kde4_integration.path =  $${INSTALL_PREFIX}/kde4/share/kde4/services/ServiceMenus
  kde4_integration.files =  doc/$${TARGET}-download.desktop
  INSTALLS =  target \
-  doc \
   man \
   icons \
   desktop \
-  dolphin_integration \
-  d3lphin_integration \
   konqueror_integration \
   kde4_integration
+  konqueror_integration
 }
 win32 {
  RC_FILE =  win32/qnapi.rc




--- src/napi.h.orig	2010-11-27 12:39:09.000000000 +0100
+++ src/napi.h	2010-11-27 12:40:06.000000000 +0100
@@ -67,7 +67,7 @@
 
 bool napiMatchSubtitles(const QString & md5sum, const QString & zip_file, const QString & movie_file,
 						bool noBackup = false, const QString & tmp_path = "/tmp",
-						const QString & p7zip_path = "/usr/bin/7z");
+						const QString & p7zip_path = "@LOCALBASE@/bin/7z");
 
 bool napiCheckUser(const QString & nick, const QString & pass);
 
@@ -76,7 +76,7 @@
 										const QString & pass, bool correct = false,
 										const QString & comment = "",
 										const QString & tmp_path = "/tmp",
-										const QString & p7zip_path = "/usr/bin/7z");
+										const QString & p7zip_path = "@LOCALBASE@/bin/7z");
 
 napiReportResult napiReportBad(const QString & movie_file, const QString & language,
 								const QString & nick, const QString & pass, const QString & comment,




bin/qnapi
kde4/share/kde4/services/ServiceMenus/qnapi-download.desktop
share/icons/qnapi.png
share/icons/qnapi-48.png
share/icons/qnapi-128.png
share/icons/qnapi-512.png
share/applications/qnapi.desktop
share/apps/dolphin/servicemenus/qnapi-download.desktop
share/apps/d3lphin/servicemenus/qnapi-download.desktop
share/apps/konqueror/servicemenus/qnapi-download.desktop
@dirrmtry kde4/share/kde4/services/ServiceMenus
@dirrmtry kde4/share/kde4/services
@dirrmtry kde4/share/kde4
@dirrmtry kde4/share
@dirrmtry kde4
@dirrmtry share/apps/konqueror/servicemenus
@dirrmtry share/apps/konqueror
@dirrmtry share/apps/dolphin/servicemenus
@dirrmtry share/apps/dolphin
@dirrmtry share/apps
@dirrmtry share/applications
@dirrmtry share/icons

Return to bug 152619

Lines 1-5 Link Here

(-)/home/corn/devel/qnapi/files/patch-qnapi.pro (-15 / +11 lines)
1	--- qnapi.pro.orig Tue May 20 18:50:01 2008	1	--- qnapi.pro.orig 2008-05-20 18:50:01.000000000 +0200
2	+++ qnapi.pro Mon Jun 2 15:00:17 2008	2	+++ qnapi.pro 2010-11-27 13:38:04.000000000 +0100
3	@@ -77,7 +77,7 @@	3	@@ -77,7 +77,7 @@
4	#QMAKE_BUNDLE_DATA += 7ZIP_BINARY	4	#QMAKE_BUNDLE_DATA += 7ZIP_BINARY
5	}	5	}
Lines 9-15 Link Here
9	target.path = $${INSTALL_PREFIX}/bin	9	target.path = $${INSTALL_PREFIX}/bin
10	doc.path = $${INSTALL_PREFIX}/share/doc/$${TARGET}	10	doc.path = $${INSTALL_PREFIX}/share/doc/$${TARGET}
11	doc.files = doc/ChangeLog \	11	doc.files = doc/ChangeLog \
12	@@ -89,29 +89,27 @@	12	@@ -89,27 +89,24 @@
13	doc/COPYRIGHT \	13	doc/COPYRIGHT \
14	doc/qnapi-download.desktop \	14	doc/qnapi-download.desktop \
15	doc/qnapi-download.schemas	15	doc/qnapi-download.schemas
Lines 22-48 Link Here
22	- desktop.path = /usr/share/applications	22	- desktop.path = /usr/share/applications
23	+ desktop.path = $${INSTALL_PREFIX}/share/applications	23	+ desktop.path = $${INSTALL_PREFIX}/share/applications
24	desktop.files = doc/$${TARGET}.desktop	24	desktop.files = doc/$${TARGET}.desktop
25	- dolphin_integration.path = /usr/share/apps/dolphin/servicemenus	25	dolphin_integration.path = /usr/share/apps/dolphin/servicemenus
26	+ dolphin_integration.path = $${INSTALL_PREFIX}/share/apps/dolphin/servicemenus
27	dolphin_integration.files = doc/$${TARGET}-download.desktop	26	dolphin_integration.files = doc/$${TARGET}-download.desktop
28	- d3lphin_integration.path = /usr/share/apps/d3lphin/servicemenus	27	d3lphin_integration.path = /usr/share/apps/d3lphin/servicemenus
29	+ d3lphin_integration.path = $${INSTALL_PREFIX}/share/apps/d3lphin/servicemenus
30	d3lphin_integration.files = doc/$${TARGET}-download.desktop	28	d3lphin_integration.files = doc/$${TARGET}-download.desktop
31	- konqueror_integration.path = /usr/share/apps/konqueror/servicemenus	29	- konqueror_integration.path = /usr/share/apps/konqueror/servicemenus
32	+ konqueror_integration.path = $${INSTALL_PREFIX}/share/apps/konqueror/servicemenus	30	+ konqueror_integration.path = $${INSTALL_PREFIX}/share/apps/konqueror/servicemenus
33	konqueror_integration.files = doc/$${TARGET}-download.desktop	31	konqueror_integration.files = doc/$${TARGET}-download.desktop
34	kde4_integration.path = /usr/lib/kde4/share/kde4/services/ServiceMenus	32	- kde4_integration.path = /usr/lib/kde4/share/kde4/services/ServiceMenus
		33	+ kde4_integration.path = $${INSTALL_PREFIX}/kde4/share/kde4/services/ServiceMenus
35	kde4_integration.files = doc/$${TARGET}-download.desktop	34	kde4_integration.files = doc/$${TARGET}-download.desktop
36	INSTALLS = target \	35	INSTALLS = target \
37	- doc \	36	- doc \
38	man \	37	man \
39	icons \	38	icons \
40	desktop \	39	desktop \
41	dolphin_integration \	40	- dolphin_integration \
42	d3lphin_integration \	41	- d3lphin_integration \
43	- konqueror_integration \	42	konqueror_integration \
44	- kde4_integration	43	kde4_integration
45	+ konqueror_integration
46	}	44	}
47	win32 {
48	RC_FILE = win32/qnapi.rc

Line 0 Link Here

(-)/home/corn/devel/qnapi/files/patch-src-napi.h (+20 lines)
	1	--- src/napi.h.orig 2010-11-27 12:39:09.000000000 +0100
	2	+++ src/napi.h 2010-11-27 12:40:06.000000000 +0100
	3	@@ -67,7 +67,7 @@
	4
	5	bool napiMatchSubtitles(const QString & md5sum, const QString & zip_file, const QString & movie_file,
	6	bool noBackup = false, const QString & tmp_path = "/tmp",
	7	- const QString & p7zip_path = "/usr/bin/7z");
	8	+ const QString & p7zip_path = "@LOCALBASE@/bin/7z");
	9
	10	bool napiCheckUser(const QString & nick, const QString & pass);
	11
	12	@@ -76,7 +76,7 @@
	13	const QString & pass, bool correct = false,
	14	const QString & comment = "",
	15	const QString & tmp_path = "/tmp",
	16	- const QString & p7zip_path = "/usr/bin/7z");
	17	+ const QString & p7zip_path = "@LOCALBASE@/bin/7z");
	18
	19	napiReportResult napiReportBad(const QString & movie_file, const QString & language,
	20	const QString & nick, const QString & pass, const QString & comment,

Lines 1-18 Link Here

(-)/home/corn/devel/qnapi/pkg-plist (-6 / +6 lines)
1	bin/qnapi	1	bin/qnapi
		2	kde4/share/kde4/services/ServiceMenus/qnapi-download.desktop
2	share/icons/qnapi.png	3	share/icons/qnapi.png
3	share/icons/qnapi-48.png	4	share/icons/qnapi-48.png
4	share/icons/qnapi-128.png	5	share/icons/qnapi-128.png
5	share/icons/qnapi-512.png	6	share/icons/qnapi-512.png
6	share/applications/qnapi.desktop	7	share/applications/qnapi.desktop
7	share/apps/dolphin/servicemenus/qnapi-download.desktop
8	share/apps/d3lphin/servicemenus/qnapi-download.desktop
9	share/apps/konqueror/servicemenus/qnapi-download.desktop	8	share/apps/konqueror/servicemenus/qnapi-download.desktop
10	@dirrmtry share/apps/d3lphin/servicemenus	9	@dirrmtry kde4/share/kde4/services/ServiceMenus
11	@dirrmtry share/apps/d3lphin	10	@dirrmtry kde4/share/kde4/services
		11	@dirrmtry kde4/share/kde4
		12	@dirrmtry kde4/share
		13	@dirrmtry kde4
12	@dirrmtry share/apps/konqueror/servicemenus	14	@dirrmtry share/apps/konqueror/servicemenus
13	@dirrmtry share/apps/konqueror	15	@dirrmtry share/apps/konqueror
14	@dirrmtry share/apps/dolphin/servicemenus
15	@dirrmtry share/apps/dolphin
16	@dirrmtry share/apps	16	@dirrmtry share/apps
17	@dirrmtry share/applications	17	@dirrmtry share/applications
18	@dirrmtry share/icons	18	@dirrmtry share/icons