From ee9b542414f7c587d13e81d858fa780259b4375a Mon Sep 17 00:00:00 2001 From: onekk Date: Thu, 26 Jun 2014 16:37:29 +0200 Subject: [PATCH 1/6] New Package: gpsbabel GPS data conversione and transfer. Hope it is packaged righ, on my installation build fine. Regards Carlo D. --- srcpkgs/gpsbabel-gui | 1 + srcpkgs/gpsbabel/patches/A4-doc.txt | 15 ++++++++ srcpkgs/gpsbabel/template | 54 +++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 120000 srcpkgs/gpsbabel-gui create mode 100644 srcpkgs/gpsbabel/patches/A4-doc.txt create mode 100644 srcpkgs/gpsbabel/template diff --git a/srcpkgs/gpsbabel-gui b/srcpkgs/gpsbabel-gui new file mode 120000 index 00000000000..2f617d763ff --- /dev/null +++ b/srcpkgs/gpsbabel-gui @@ -0,0 +1 @@ +./gpsbabel \ No newline at end of file diff --git a/srcpkgs/gpsbabel/patches/A4-doc.txt b/srcpkgs/gpsbabel/patches/A4-doc.txt new file mode 100644 index 00000000000..55bd760f45e --- /dev/null +++ b/srcpkgs/gpsbabel/patches/A4-doc.txt @@ -0,0 +1,15 @@ +--- Makefile.in 2014-04-14 04:29:46.000000000 +0200 ++++ Makefile.in.new 2014-06-15 15:32:23.392644000 +0200 +@@ -252,7 +252,11 @@ + perl xmldoc/makedoc + xmlwf xmldoc/readme.xml #check for well-formedness + xmllint --noout --valid xmldoc/readme.xml #validate +- xsltproc -o $@ xmldoc/babelpdf.xsl xmldoc/readme.xml ++ xsltproc \ ++ -o $@ \ ++ --stringparam paper.type A4 \ ++ xmldoc/babelpdf.xsl \ ++ xmldoc/readme.xml + + gpsbabel.pdf: gpsbabel.fo + fop -q -fo gpsbabel.fo -pdf gpsbabel.pdf diff --git a/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template new file mode 100644 index 00000000000..70d6609e54f --- /dev/null +++ b/srcpkgs/gpsbabel/template @@ -0,0 +1,54 @@ +# Template file for 'gpsbabel' +pkgname=gpsbabel +version=1.5.1 +revision=1 +build_style=gnu-configure +maintainer="Carlo Dormeletti " +homepage="http://www.gpsbabel.org/" +license="GPL-2" +short_desc="GPSBabel converts waypoints, tracks, and routes between popular GPS formats" +configure_args="" +hostmakedepends="perl>=5.18 docbook-xml" +makedepends="qt-devel libusb-compat-devel expat-devel libxml2-devel xmlwf libxslt-devel offo-hyphenation" +distfiles="http://arch.p5n.pp.ru/~sergej/dl/2014/${pkgname}-${version}.tar.gz" +checksum="3feec7d43ca6cb5393645fe0df893d9f7bf5334849fa8abd4c5c3ee775c8cac3" + +do_build(){ + . /etc/profile.d/oracle-jre.sh + make + make doc + cd gui + qmake + make +} + +do_install(){ + make install DESTDIR=${DESTDIR} + vmkdir usr/share/doc/${pkgname} + vcopy "README*" usr/share/doc/${pkgname} + vcopy "AUTHORS" usr/share/doc/${pkgname} + vcopy "COPYING" usr/share/doc/${pkgname} + vcopy "gpsbabel.pdf" usr/share/doc/${pkgname} + vcopy "gpsbabel-sample.ini" usr/share/doc/${pkgname} + vcopy "guibabel" usr/share/doc/${pkgname} + vcopy "style" usr/share/doc/${pkgname} +} + +do_clean() { + # Remove temporary stuff from masterdir + rm -rf ${XBPS_BUILDDIR}/babelweb +} + +gpsbabel-gui_package() { + short_desc+=" - Qt4 GUI" + depends="${pkgname}>=${version}_${revision}" + pkg_install() { + vmkdir usr/bin + vcopy ${wrksrc}/gui/gpsbabelfe usr/bin + vcopy ${wrksrc}/gui/objects/gpsbabelfe-bin usr/bin + vmkdir usr/share/applications + vcopy ${wrksrc}/gui/gpsbabel.desktop usr/share/applications + + } +} + From b56e2cd115db39f177080da373ec4810779dd2b2 Mon Sep 17 00:00:00 2001 From: onekk Date: Sat, 28 Jun 2014 17:04:27 +0200 Subject: [PATCH 2/6] Gpsbabel: done modification on the template file and added the icon in /usr/share/doc/gpsbabel Regards Carlo --- srcpkgs/gpsbabel/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template index 70d6609e54f..9b5942808db 100644 --- a/srcpkgs/gpsbabel/template +++ b/srcpkgs/gpsbabel/template @@ -6,8 +6,7 @@ build_style=gnu-configure maintainer="Carlo Dormeletti " homepage="http://www.gpsbabel.org/" license="GPL-2" -short_desc="GPSBabel converts waypoints, tracks, and routes between popular GPS formats" -configure_args="" +short_desc="Converts waypoints, tracks, and routes between popular GPS formats" hostmakedepends="perl>=5.18 docbook-xml" makedepends="qt-devel libusb-compat-devel expat-devel libxml2-devel xmlwf libxslt-devel offo-hyphenation" distfiles="http://arch.p5n.pp.ru/~sergej/dl/2014/${pkgname}-${version}.tar.gz" @@ -35,20 +34,20 @@ do_install(){ } do_clean() { - # Remove temporary stuff from masterdir + # Remove temporary stuff from masterdir rm -rf ${XBPS_BUILDDIR}/babelweb } gpsbabel-gui_package() { short_desc+=" - Qt4 GUI" - depends="${pkgname}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmkdir usr/bin vcopy ${wrksrc}/gui/gpsbabelfe usr/bin vcopy ${wrksrc}/gui/objects/gpsbabelfe-bin usr/bin vmkdir usr/share/applications vcopy ${wrksrc}/gui/gpsbabel.desktop usr/share/applications - + vcopy ${wrksrc}/gui/images/appicon.png /usr/share/doc/${pkgname} } } From 58dd71d2a18acb7edd3c6cf357841b8cbafe402a Mon Sep 17 00:00:00 2001 From: onekk Date: Mon, 30 Jun 2014 00:31:44 +0200 Subject: [PATCH 3/6] Package gpsbabel: done the modification required in makedepends and hostmakedepends, plus some vinstall instead wmkdir+vcopy. Regards Carlo --- srcpkgs/gpsbabel/template | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template index 9b5942808db..5b5286cec09 100644 --- a/srcpkgs/gpsbabel/template +++ b/srcpkgs/gpsbabel/template @@ -7,8 +7,8 @@ maintainer="Carlo Dormeletti " homepage="http://www.gpsbabel.org/" license="GPL-2" short_desc="Converts waypoints, tracks, and routes between popular GPS formats" -hostmakedepends="perl>=5.18 docbook-xml" -makedepends="qt-devel libusb-compat-devel expat-devel libxml2-devel xmlwf libxslt-devel offo-hyphenation" +hostmakedepends="perl>=5.18 docbook-xml xmlwf offo-hyphenation" +makedepends="qt-devel libusb-compat-devel expat-devel libxml2-devel libxslt-devel desktop-file-utils" distfiles="http://arch.p5n.pp.ru/~sergej/dl/2014/${pkgname}-${version}.tar.gz" checksum="3feec7d43ca6cb5393645fe0df893d9f7bf5334849fa8abd4c5c3ee775c8cac3" @@ -42,12 +42,10 @@ gpsbabel-gui_package() { short_desc+=" - Qt4 GUI" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { - vmkdir usr/bin - vcopy ${wrksrc}/gui/gpsbabelfe usr/bin - vcopy ${wrksrc}/gui/objects/gpsbabelfe-bin usr/bin - vmkdir usr/share/applications - vcopy ${wrksrc}/gui/gpsbabel.desktop usr/share/applications - vcopy ${wrksrc}/gui/images/appicon.png /usr/share/doc/${pkgname} + vinstall ${wrksrc}/gui/gpsbabelfe 644 usr/bin + vinstall ${wrksrc}/gui/objects/gpsbabelfe-bin 644 usr/bin + vinstall ${wrksrc}/gui/gpsbabel.desktop 644 usr/share/applications + vinstall ${wrksrc}/gui/images/appicon.png 644 usr/share/pixmaps } } From 5b9a3ff09a4d4090496315fa93cfb63dde4aaf9c Mon Sep 17 00:00:00 2001 From: onekk Date: Mon, 30 Jun 2014 16:10:47 +0200 Subject: [PATCH 4/6] Package gpsbabel: modified permissions of some file and done some cleanup of the template file (more elegant lines Thanks to asergi) Regards Carlo D. --- srcpkgs/gpsbabel/template | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template index 5b5286cec09..ee1ac88e5d2 100644 --- a/srcpkgs/gpsbabel/template +++ b/srcpkgs/gpsbabel/template @@ -24,13 +24,7 @@ do_build(){ do_install(){ make install DESTDIR=${DESTDIR} vmkdir usr/share/doc/${pkgname} - vcopy "README*" usr/share/doc/${pkgname} - vcopy "AUTHORS" usr/share/doc/${pkgname} - vcopy "COPYING" usr/share/doc/${pkgname} - vcopy "gpsbabel.pdf" usr/share/doc/${pkgname} - vcopy "gpsbabel-sample.ini" usr/share/doc/${pkgname} - vcopy "guibabel" usr/share/doc/${pkgname} - vcopy "style" usr/share/doc/${pkgname} + vcopy "README* AUTHORS COPYING gpsbabel.pdf gpsbabel-sample.ini guibabel style" usr/share/doc/${pkgname} } do_clean() { @@ -42,8 +36,8 @@ gpsbabel-gui_package() { short_desc+=" - Qt4 GUI" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { - vinstall ${wrksrc}/gui/gpsbabelfe 644 usr/bin - vinstall ${wrksrc}/gui/objects/gpsbabelfe-bin 644 usr/bin + vinstall ${wrksrc}/gui/gpsbabelfe 755 usr/bin + vinstall ${wrksrc}/gui/objects/gpsbabelfe-bin 755 usr/bin vinstall ${wrksrc}/gui/gpsbabel.desktop 644 usr/share/applications vinstall ${wrksrc}/gui/images/appicon.png 644 usr/share/pixmaps } From 0b094f0cfe2b9b1ba39361c398ce359719cca01c Mon Sep 17 00:00:00 2001 From: onekk Date: Tue, 1 Jul 2014 17:17:22 +0200 Subject: [PATCH 5/6] Package: gpsbabel corrected the name of the appicon Sorry, I haven't read well the comments Regards Carlo D. --- srcpkgs/gpsbabel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template index ee1ac88e5d2..beb04623d22 100644 --- a/srcpkgs/gpsbabel/template +++ b/srcpkgs/gpsbabel/template @@ -39,7 +39,7 @@ gpsbabel-gui_package() { vinstall ${wrksrc}/gui/gpsbabelfe 755 usr/bin vinstall ${wrksrc}/gui/objects/gpsbabelfe-bin 755 usr/bin vinstall ${wrksrc}/gui/gpsbabel.desktop 644 usr/share/applications - vinstall ${wrksrc}/gui/images/appicon.png 644 usr/share/pixmaps + vinstall ${wrksrc}/gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png } } From 436c6afc4d2a8fb685e350f4dc0a3df2cfa6f33e Mon Sep 17 00:00:00 2001 From: onekk Date: Fri, 4 Jul 2014 00:51:24 +0200 Subject: [PATCH 6/6] Package: gosbabel correctly add dependencies on desktop-file-utils on gui-part instead of on the main package Regards Carlo --- srcpkgs/gpsbabel/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template index beb04623d22..c99e4ad653a 100644 --- a/srcpkgs/gpsbabel/template +++ b/srcpkgs/gpsbabel/template @@ -8,7 +8,7 @@ homepage="http://www.gpsbabel.org/" license="GPL-2" short_desc="Converts waypoints, tracks, and routes between popular GPS formats" hostmakedepends="perl>=5.18 docbook-xml xmlwf offo-hyphenation" -makedepends="qt-devel libusb-compat-devel expat-devel libxml2-devel libxslt-devel desktop-file-utils" +makedepends="qt-devel libusb-compat-devel expat-devel libxml2-devel libxslt-devel" distfiles="http://arch.p5n.pp.ru/~sergej/dl/2014/${pkgname}-${version}.tar.gz" checksum="3feec7d43ca6cb5393645fe0df893d9f7bf5334849fa8abd4c5c3ee775c8cac3" @@ -16,7 +16,7 @@ do_build(){ . /etc/profile.d/oracle-jre.sh make make doc - cd gui + cd gui qmake make } @@ -29,12 +29,12 @@ do_install(){ do_clean() { # Remove temporary stuff from masterdir - rm -rf ${XBPS_BUILDDIR}/babelweb + rm -rf ${XBPS_BUILDDIR}/babelweb } gpsbabel-gui_package() { short_desc+=" - Qt4 GUI" - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} desktop-file-utils" pkg_install() { vinstall ${wrksrc}/gui/gpsbabelfe 755 usr/bin vinstall ${wrksrc}/gui/objects/gpsbabelfe-bin 755 usr/bin