Version bump, add multilib split package, drop i686 support

1 files changed, 51 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7c72e4ead8b9..915acfa78c1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,72 @@
 # Maintainer: Renato Molnar <m dot renato93 at gmail dot com>
 
-pkgname=notepadpp
-pkgver=7.5.9
+pkgbase=notepadpp
+pkgname=("notepadpp" "notepadpp-win32")
+pkgver=7.6
 pkgrel=1
-pkgdesc="A free source code editor."
-arch=('i686' 'x86_64')
+pkgdesc="A free source code editor for windows"
+arch=('x86_64')
 url="https://notepad-plus-plus.org/"
 license=('GPL2')
 depends=('wine' 'sh')
 makedepends=('unzip')
 source=(notepadpp
         notepadpp.desktop
-        notepadpp.png)
-source_i686=("notepad-plus-plus.bin.zip"::"https://notepad-plus-plus.org/repository/${pkgver%%.*}.x/${pkgver}/npp.${pkgver}.bin.zip")
-source_x86_64=("notepad-plus-plus.bin.zip"::"https://notepad-plus-plus.org/repository/${pkgver%%.*}.x/${pkgver}/npp.${pkgver}.bin.x64.zip")
+        notepadpp.png
+        "https://notepad-plus-plus.org/repository/${pkgver%%.*}.x/${pkgver}/npp.${pkgver}.bin.zip"
+        "https://notepad-plus-plus.org/repository/${pkgver%%.*}.x/${pkgver}/npp.${pkgver}.bin.x64.zip")
 
-noextract=("notepad-plus-plus.bin.zip")
+noextract=("npp.${pkgver}.bin.zip"
+           "npp.${pkgver}.bin.x64.zip")
 
-sha256sums=('e78cf94d8bd24f692b1e9351988054b9d0128d39b58363df94233d2a1bd1ad40'
+sha256sums=('23c83aa671be37dae7ea773a5cb43727ed22b985c763069fb3b6747cf2242434'
             'a1c34d444893d56ae165c8457260e11b729ea2afc10bb9e2690bc89e1f523238'
-            '04c8ad254a41350078bba4d56ad54f7b4c0df125029aee021ea0ac632971ebad')
-sha256sums_i686=('20e1b85d7081f7def11a60d8540adb22b7d77e215da1b99f3768b9271cd6eed1')
-sha256sums_x86_64=('8e31e7aa5c7a5280ec7a1f3ba456734fdc24cb2969a4b07af41b628459695a2c')
+            '04c8ad254a41350078bba4d56ad54f7b4c0df125029aee021ea0ac632971ebad'
+            '8ba730272708717fa8b85d1c7d20887f33c9ce14979e2539dd73f165f351a712'
+            '3411a4437077c5d10d3a5fbf79853c33c52ac66b565e0f94d10e7483e864a8bd')
+
 options=('!strip')
 
-package() {
-    install -d -m755 "$pkgdir/usr/share/$pkgname"
+package_notepadpp() {
+    pkgdesc+=" (64-bit)"
+    arch=('x86_64')
+    conflicts=("notepadpp-win32")
+    provides=("notepadpp")
+
+    install -d -m755 "$pkgdir/usr/share/$pkgbase"
+
+#    if [ "${CARCH}" == i686 ]; then
+#        unzip "npp.${pkgver}.bin.zip" -d "$pkgdir/usr/share/$pkgbase"
+#    elif [ "${CARCH}" == x86_64 ]; then
+     unzip "npp.${pkgver}.bin.x64.zip" -d "$pkgdir/usr/share/$pkgbase"
+#    fi
+
+    rm -rf "$pkgdir/usr/share/$pkgbase/updater" \
+           "$pkgdir/usr/share/$pkgbase/license.txt" \
+
+    find "$pkgdir/usr/share/$pkgbase" -type d -exec chmod 755 "{}" \;
+    find "$pkgdir/usr/share/$pkgbase" -type f -exec chmod 644 "{}" \;
+
+    install -D -m755 notepadpp "$pkgdir/usr/bin/notepadpp"
+    install -D -m644 notepadpp.png "$pkgdir/usr/share/pixmaps/notepadpp.png"
+    install -D -m644 notepadpp.desktop "$pkgdir/usr/share/applications/notepadpp.desktop"
+}
+
+package_notepadpp-win32() {
+    pkgdesc+=" (32-bit)"
+    arch=("x86_64")
+    conflicts=("notepadpp")
+    provides=("notepadpp")
 
-    unzip notepad-plus-plus.bin.zip -d "$pkgdir/usr/share/$pkgname"
+    install -d -m755 "$pkgdir/usr/share/$pkgbase"
 
-    rm -rf "$pkgdir/usr/share/$pkgname/updater" \
-           "$pkgdir/usr/share/$pkgname/license.txt" \
+    unzip "npp.${pkgver}.bin.zip" -d "$pkgdir/usr/share/$pkgbase"
 
-#    cp -r "$srcdir" "$pkgdir/usr/share/$pkgname"
+    rm -rf "$pkgdir/usr/share/$pkgbase/updater" \
+           "$pkgdir/usr/share/$pkgbase/license.txt" \
 
-    find "$pkgdir/usr/share/$pkgname" -type d -exec chmod 755 "{}" \;
-    find "$pkgdir/usr/share/$pkgname" -type f -exec chmod 644 "{}" \;
+    find "$pkgdir/usr/share/$pkgbase" -type d -exec chmod 755 "{}" \;
+    find "$pkgdir/usr/share/$pkgbase" -type f -exec chmod 644 "{}" \;
 
     install -D -m755 notepadpp "$pkgdir/usr/bin/notepadpp"
     install -D -m644 notepadpp.png "$pkgdir/usr/share/pixmaps/notepadpp.png"