[arch-commits] Commit in keepass/trunk (KeePass.config.xml PKGBUILD keepass.install)

[Timothy Redaelli]

    Date: Wednesday, November 20, 2013 @ 15:18:24
  Author: tredaelli
Revision: 101248

upgpkg: keepass 2.24-2

Modified:
  keepass/trunk/PKGBUILD
  keepass/trunk/keepass.install
Deleted:
  keepass/trunk/KeePass.config.xml

-----------------+
 PKGBUILD        |   47 +++++++++++++++++++++++++++++------------------
 keepass.install |   36 +++++-------------------------------
 2 files changed, 34 insertions(+), 49 deletions(-)

Deleted: KeePass.config.xml
===================================================================
(Binary files differ)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-20 14:03:11 UTC (rev 101247)
+++ PKGBUILD	2013-11-20 14:18:24 UTC (rev 101248)
@@ -5,7 +5,7 @@
 
 pkgname=keepass
 pkgver=2.24
-pkgrel=1
+pkgrel=2
 pkgdesc='A easy-to-use password manager for Windows, Linux, Mac OS X and mobile devices.'
 arch=('any')
 url='http://keepass.info/'
@@ -15,33 +15,46 @@
 optdepends=('xdotool: if you want to use auto-type'
             'xsel: clipboard operations in order to work around Mono clipboard bugs')
 install="$pkgname.install"
-source=("http://downloads.sourceforge.net/keepass/KeePass-$pkgver.zip"
+source=("http://downloads.sourceforge.net/keepass/KeePass-$pkgver-Source.zip"
         'keepass'
         'keepass.1'
         'keepass.desktop'
-        'keepass.xml'
-        'KeePass.config.xml')
+        'keepass.xml')
 
-sha256sums=('180c2e1187400d23dc5fda0342891f39179cb699c9b9b312f41a3b06e6557076'
+sha256sums=('c0ea4da461d267ab95b92a9398328b1a85bc163316503d2354b2cc1ad46e7dce'
             '7547f2af38771b66c8c2f3d7900b051b37214af49de3dfa27a5d383bf847d582'
             'a5fff678466443c0c8256c4771128c86103da47b6a2c49351d9941191b65dd6f'
             '1d5420e8babce5f4bbb3c68bdffe3bc0d3c3be25ad689138cd02fa14edd89140'
-            '3d017c17a8788166c644e2460ba3596fd503f300342561921201fe5f69e5d194'
-            'c4a3626bbcdfe4b17759e75582ad5f89beaa28efc857431f373e104fbe7b8440')
+            '3d017c17a8788166c644e2460ba3596fd503f300342561921201fe5f69e5d194')
 
+prepare() {
+  # Extract icons
+  icotool -x KeePass/KeePass.ico
+
+  pushd Build &>/dev/null
+  bash PrepMonoDev.sh
+  popd &>/dev/null
+
+  # FIXME Right alignment doesn't work correctly (truncated text).
+  sed -i 's/^\(\s*\S*\.TextAlign\s*=\s*System\.Windows\.Forms\.HorizontalAlignment\).Right\(;\s*\)$/\1.Left\2/g' \
+    KeePass/Forms/*.Designer.cs
+}
+
+build() {
+  xbuild /target:KeePass /property:Configuration=Release
+  cp Ext/KeePass.exe.config Build/KeePass/Release/
+}
+
 package() {
-  cd "$srcdir"
-
   install -dm755 "$pkgdir"/usr/bin
   install -dm755 "$pkgdir"/usr/share/keepass/XSL
 
   install -Dm755 keepass "$pkgdir"/usr/bin/keepass
-  install -Dm755 KeePass.exe "$pkgdir"/usr/share/keepass/KeePass.exe
-  install -Dm755 KeePass.config.xml "$pkgdir"/usr/share/keepass/KeePass.config.xml
-  install -Dm755 KeePass.exe.config "$pkgdir"/usr/share/keepass/KeePass.exe.config
-  install -Dm755 KeePass.chm "$pkgdir"/usr/share/keepass/KeePass.chm
+  install -Dm755 Build/KeePass/Release/KeePass.exe "$pkgdir"/usr/share/keepass/KeePass.exe
+  install -Dm755 Ext/KeePass.config.xml "$pkgdir"/usr/share/keepass/KeePass.config.xml
+  install -Dm755 Ext/KeePass.exe.config "$pkgdir"/usr/share/keepass/KeePass.exe.config
 
-  install -m644 XSL/* "$pkgdir"/usr/share/keepass/XSL
+  install -m644 Ext/XSL/* "$pkgdir"/usr/share/keepass/XSL
 
   install -Dm644 keepass.1 "$pkgdir"/usr/share/man/man1/keepass.1
 
@@ -48,12 +61,10 @@
   # Proper installation of .desktop file
   desktop-file-install -m 644 --dir "$pkgdir"/usr/share/applications/ keepass.desktop
 
-  # Extract and install icons
-  wrestool -o . --type=14 -x KeePass.exe
-  icotool -x KeePass.exe_*.ico
+  # Install icons
   for size in 16 32 48 256; do
     install -Dm644 \
-    KeePass.exe_*_${size}x${size}x32.png \
+    KeePass_*_${size}x${size}x32.png \
     "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/keepass.png
   done
 

Modified: keepass.install
===================================================================
--- keepass.install	2013-11-20 14:03:11 UTC (rev 101247)
+++ keepass.install	2013-11-20 14:18:24 UTC (rev 101248)
@@ -1,20 +1,7 @@
 post_install() {
-  echo "Installing icons for mimetypes..."
-  for size in 16 32 48 256; do
-    xdg-icon-resource install --context mimetypes --size $size \
-    "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/keepass.png application-x-keepass2
-  done
-  echo "done."
-  
-  echo "Adding file type descriptions provided in mimetypes-file to the desktop environment..."
-  xdg-mime install --novendor /usr/share/mime/packages/keepass.xml
-  echo "done."
-  
-  echo "Updating icon, desktop and MIME caches..."
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  mono --aot -O=all usr/share/keepass/KeePass.exe &> /dev/null
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
   update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  echo "done."
 }
 
 post_upgrade() {
@@ -21,20 +8,7 @@
   post_install
 }
 
-pre_remove() {
-  echo "Removing icons for mimetypes..."
-  for size in 16 32 48 256; do
-    xdg-icon-resource uninstall --context mimetypes --size $size application-x-keepass2
-  done
-  echo "done."
-  
-  echo "Removing file type descriptions provided in mimetypes-file from the desktop environment..."
-  xdg-mime uninstall /usr/share/mime/packages/keepass.xml
-  echo "done."
-  
-  echo "Updating icon, desktop and MIME caches..."
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  echo "done."
+post_remove() {
+  rm -f usr/share/keepass/KeePass.exe.so
+  post_install
 }