qlandkartegt update, part of the exif group

qlandkartegt/PKGBUILD

@@ -1,25 +1,23 @@
 #
 # Apps Packages for Chakra, part of chakra-project.org
 #
-# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
+# maintainer abveritas@chakra-project.org
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 
 pkgname=qlandkartegt
-pkgver=1.2.2
+pkgver=1.5.3
 pkgrel=1
 pkgdesc="Use your GPS with Linux"
+screenshot="http://sourceforge.net/dbimage.php?id=176174"
 arch=('i686' 'x86_64')
 url="http://www.qlandkarte.org"
 license=('GPL')
-depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'mesa' 'postgresql-libs' 'qt' 'shared-mime-info')
+depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'mesa' 'postgresql-libs' 
-optdepends=('garmindev: to connect garmin devices')
+         'qt' 'shared-mime-info' 'qtwebkit')
-makedepends=('cmake>=2.6' 'garmindev')
+makedepends=('cmake')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz \
+categories=('utils')
-        $pkgname-mimetypes.xml)
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" 
-md5sums=('978e8edd0469900fbeedf003ba384fcf'
+        'qlandkartegt-mimetypes.xml')
+md5sums=('15d0143e1561b5f35f8d4e98c943cbb9'
          'e4808690a9b5381880c573abd81cffdd')
 
 

qlandkartegt/qlandkartegt.desktop

@@ -2,7 +2,6 @@
 Encoding=UTF-8
 Version=1.0
 Name=QLandkarteGT
-Name[it]=QLandkarteGT
 Exec=qlandkartegt
 Icon=qlandkartegt
 Terminal=false
@@ -10,4 +9,4 @@ Type=Application
 X-MultipleArgs=false
 Categories=Qt;Utility;Geography
 GenericName=Garmin GPS utility
-GenericName[it]=Utilità per GPS Garmin
+MimeType=application/vnd.qlandkartegt.qlb;application/x-extension-gpx

virtualbox/PKGBUILD

@@ -5,12 +5,13 @@
 # Contributor: Sebastien Luttringer <seblu[plus]arch[at]seblu[dot]net>
 
 pkgname=virtualbox
-pkgver=4.2.0
+pkgver=4.2.2
-_build=80737
+_build=81494
-pkgrel=5
+pkgrel=2
 pkgdesc='Oracle VM VirtualBox Binary Edition'
 arch=('i686' 'x86_64')
 url='http://virtualbox.org/'
+screenshot='https://www.virtualbox.org/raw-attachment/wiki/Screenshots/gnome.png'
 license=('GPL2')
 depends=('libidl2' 'libxcursor' 'libxinerama' 'libxslt' 'curl' 'linux-headers'
          'python2' 'make' 'gcc')
@@ -27,29 +28,32 @@ optdepends=('virtualbox-ext-oracle: for Oracle extensions'
 provides=("virtualbox=${pkgver}")
 conflicts=('virtualbox' 'virtualbox-ose' 'virtualbox-modules')
 categories=('system')
-backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxdrv' 'etc/conf.d/vboxweb')
+backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxdrv' 'etc/conf.d/vboxweb' 'etc/modules-load.d/virtualbox.conf')
-install="${pkgname}.install"
+install=${pkgname}.install
-screenshot='https://www.virtualbox.org/raw-attachment/wiki/Screenshots/gnome.png'
 
 _sarch='x86'
 [ "${CARCH}" = 'x86_64' ] && _sarch='amd64'
 
-source=(
+source=("VirtualBox-${pkgver}-${_build}-Linux_${_sarch}.run::http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}-${_build}-Linux_${_sarch}.run"
-  "VirtualBox-${pkgver}-${_build}-Linux_${_sarch}.run::http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}-${_build}-Linux_${_sarch}.run"
+        '10-vboxdrv.rules'
-  '10-vboxdrv.rules'
+        'vboxdrv.rc'
-  'vboxsetup.sh'
+        'vboxdrv.conf'
-  'vboxdrv.conf'
+        'vboxweb.rc'
-  'vboxweb.conf'
+        'vboxweb.conf'
-  'vboxweb.service'
+        'vboxweb.service'
-)
+        'virtualbox.conf'
-sha256sums=('04030998f15b656e9b76064cde3e6cb43c5a41b1e25e700f123f5a629578fe5e'
+        'vboxsetup.sh')
+sha256sums=('a4d1d1f3047fb3e242338dbaa59d781b189d58021a04d29aac0a3f8ab7b54733'
             '69417a9e8855cab8e4878886abe138f559fd17ae487d4cd19c8a24974a8bbec2'
-            '9f70a97db16c85d347297a9fd5a416931990591686f0b3279bc9c32aab800688'
+            '7fc3a205575f0f1ae8875e8593bfb08959fd6ee45eed2edf25509e8bd225a3dc'
             '71740893a5f226f9d9fcc607ab9d39b7de816b2759625b34da19162bc7e579ff'
+            '656905de981ffa24f6f921c920538854a235225053f44baedacc07b46ca0cf56'
             '12dbba3b59991f2b68cddeeeda20236aeff63e11b7e2d1b08d9d6a82225f6651'
-            'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f')
+            'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
+            '9b3c4dc5385fb3b4aeb841043384879c5c7ee926f5343d6a4177e913604f869d'
+            '28833ef89fed96aa2cdb071c98687e8aa88e3c4c249b261f9b905e6621fa0e23')
 
-[[ "${CARCH}" = i686 ]] && sha256sums[0]='d859981312c2b6ed9e596375fc180378763b09e5a3cf0d6dd61bc252789006c4'
+[[ "${CARCH}" = i686 ]] && sha256sums[0]='e084db553064fb85136df22d13f262fef602daca56b95799cef7df761310a8d5'
 _installdir='/opt/VirtualBox'
 
 package() {
@@ -72,13 +76,6 @@ package() {
   done
   chmod go-w .
 
-  # Replace VirtualBox built-in Qt by system Qt libraries (disabled as of
-  # 2010-03-26, 3.1.6-1)
-  #for _lib in libQt{Core,Gui,Network,OpenGL}; do
-  #  rm "${_lib}VBox.so.4"
-  #  ln -s "/usr/lib/${_lib}.so.4" "${_lib}VBox.so.4"
-  #done
-
   # Patch "vboxshell.py" to use Python 2.x instead of Python 3
   sed -i 's#/usr/bin/python#\02#' "${pkgdir}/${_installdir}/vboxshell.py"
 
@@ -88,20 +85,23 @@ package() {
   sed -i -e 's,sudo /etc/init.d/vboxdrv restart,/etc/rc.d/vboxdrv restart,g' \
     "${pkgdir}/${_installdir}/VBox.sh"
 
-  # Install vboxdrv configuration
+  # Install vboxdrv initscript
+  install -D -m 0755 "${srcdir}/vboxdrv.rc" "${pkgdir}/etc/rc.d/vboxdrv"
   install -D -m 0644 "${srcdir}/vboxdrv.conf" "${pkgdir}/etc/conf.d/vboxdrv"
+  install -D -m 0644 "${srcdir}/virtualbox.conf" "${pkgdir}/etc/modules-load.d/virtualbox.conf"  
 
   # Install vboxweb initscript
+  install -D -m 0755 "${srcdir}/vboxweb.rc" "${pkgdir}/etc/rc.d/vboxweb"
   install -D -m 0644 "${srcdir}/vboxweb.conf" "${pkgdir}/etc/conf.d/vboxweb"
   install -D -m 0755 "${srcdir}/vboxweb.service" "${pkgdir}/usr/lib/systemd/system/vboxweb.service"
 
   # Install udev rules
   install -D -m 0644 "${srcdir}/10-vboxdrv.rules" "${pkgdir}/lib/udev/rules.d/10-vboxdrv.rules"
   ln -s "${_installdir}/VBoxCreateUSBNode.sh" "${pkgdir}/lib/udev/VBoxCreateUSBNode.sh"
-
+  
   # Install setup script for modules and usb devices
   install -D -m 0755 "${srcdir}/vboxsetup.sh" "${pkgdir}/usr/bin/vboxsetup"
-  
+
   # Install the SDK
   cd "${pkgdir}/${_installdir}/sdk/installer"
   VBOX_INSTALL_PATH="${_installdir}" python2 vboxapisetup.py install --root "${pkgdir}"
@@ -110,7 +110,7 @@ package() {
 
   # Symlink the launchers. Second link can fail if fs is not case sensitive.
   install -d -m 0755 "${pkgdir}/usr/bin"
-  for _bin in VirtualBox VBox{Headless,Manage,SDL,SVC,Tunctl,NetAdpCtl} rdesktop-vrdp; do
+  for _bin in VirtualBox VBox{Headless,Manage,SDL,SVC,Tunctl,NetAdpCtl} rdesktop-vrdp vboxwebsrv; do
     ln -s "${_installdir}/${_bin}" "${pkgdir}/usr/bin/${_bin}"
     ln -s "${_installdir}/${_bin}" "${pkgdir}/usr/bin/${_bin,,}" &>/dev/null || :
   done

virtualbox/vboxsetup.sh

@@ -134,6 +134,7 @@ fixusb() {
 case "$1" in
   setup)
     setup
+    load
     ;;
   fixusb)
     fixusb

virtualbox/virtualbox.install

@@ -12,7 +12,12 @@ post_install() {
   [[ -x =update-desktop-database ]] && update-desktop-database -q &>/dev/null
 
   # Build new module
-  /usr/bin/vboxsetup setup
+  systemd-notify --booted
+  if [[ "$?" -eq 0 ]]; then
+    /usr/bin/vboxsetup setup
+  else
+    /etc/rc.d/vboxdrv setup
+  fi
   
   # Show warnings
   /bin/cat <<EOF
@@ -20,10 +25,15 @@ post_install() {
 ==> Remember to add allowed users to the vboxusers group:
 ==> # gpasswd -a USERNAME vboxusers
 ==>
-==> To load virtualbox modules automatically you can add vboxdrv to a file /etc/modules-load.d/vbox.conf
+==> With systemd:
 ==> To start virtualbox web service automatically you need to enable and start the service through systemctl
-==>
 ==> To fix missing usb devices, you can call 'vboxsetup fixusb' or reboot your computer
+==>
+==> With sysvinit:
+==> To load virtualbox modules automatically you can add vboxdrv in your DAEMONS
+==> To start virtualbox web service automatically you can add vboxweb in your DAEMONS
+==> To fix missing usb devices, you can call rc.d fixusb vboxdrv or reboot your computer
+==>
 EOF
 }
 
@@ -40,18 +50,26 @@ post_upgrade() {
 
 pre_remove() {
   # Stop running services
-  _service="vboxweb.service"
-  systemctl is-active ${_service} &>/dev/null
-  if [[ $? -eq 0 ]] ; then
-	systemctl stop ${_service}
-  fi
-  systemctl is-enabled ${_service} &>/dev/null
-  if [[ $? -eq 0 ]] ; then
-	systemctl disable ${_service}
-  fi
   
+  systemd-notify --booted
+  if [[ "$?" -eq 0 ]]; then
+    _service="vboxweb.service"
+    systemctl is-active ${_service} &>/dev/null
+    if [[ "$?" -eq 0 ]]; then
+      systemctl stop ${_service}
+    fi
+    systemctl is-enabled ${_service} &>/dev/null
+    if [[ "$?" -eq 0 ]]; then
+      systemctl disable ${_service}
+    fi
+  else
+    [[ -x /etc/rc.d/vboxdrv ]] && /etc/rc.d/vboxdrv stop
+    [[ -x /etc/rc.d/vboxweb ]] && /etc/rc.d/vboxweb stop
+  fi
+
   # Remove modules
-  if [ $(vercmp $2 4.2.0-4) -lt 0 ]; then
+  systemd-notify --booted
+  if [[ "$?" -eq 0 ]]; then
     /usr/bin/vboxsetup remove
   elif [[ -f /etc/rc.d/vboxdrv && -f /usr/sbin/rc.d ]]; then
     rc.d unload vboxdrv
@@ -77,3 +95,5 @@ post_remove() {
   # remove vboxusers group
   groupdel vboxusers &>/dev/null || true
 }
+
+# vim:set ts=2 sw=2 ft=sh et: