Version bump, add multilib split package, drop i686 support

3 files changed, 90 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e65a35702cb9..56d02f521a0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,36 @@
 pkgbase = notepadpp
-	pkgdesc = A free source code editor.
-	pkgver = 7.5.9
+	pkgdesc = A free source code editor for windows
+	pkgver = 7.6
 	pkgrel = 1
 	url = https://notepad-plus-plus.org/
-	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = unzip
 	depends = wine
 	depends = sh
-	noextract = notepad-plus-plus.bin.zip
+	noextract = npp.7.6.bin.zip
+	noextract = npp.7.6.bin.x64.zip
 	options = !strip
 	source = notepadpp
 	source = notepadpp.desktop
 	source = notepadpp.png
-	sha256sums = e78cf94d8bd24f692b1e9351988054b9d0128d39b58363df94233d2a1bd1ad40
+	source = https://notepad-plus-plus.org/repository/7.x/7.6/npp.7.6.bin.zip
+	source = https://notepad-plus-plus.org/repository/7.x/7.6/npp.7.6.bin.x64.zip
+	sha256sums = 23c83aa671be37dae7ea773a5cb43727ed22b985c763069fb3b6747cf2242434
 	sha256sums = a1c34d444893d56ae165c8457260e11b729ea2afc10bb9e2690bc89e1f523238
 	sha256sums = 04c8ad254a41350078bba4d56ad54f7b4c0df125029aee021ea0ac632971ebad
-	source_i686 = notepad-plus-plus.bin.zip::https://notepad-plus-plus.org/repository/7.x/7.5.9/npp.7.5.9.bin.zip
-	sha256sums_i686 = 20e1b85d7081f7def11a60d8540adb22b7d77e215da1b99f3768b9271cd6eed1
-	source_x86_64 = notepad-plus-plus.bin.zip::https://notepad-plus-plus.org/repository/7.x/7.5.9/npp.7.5.9.bin.x64.zip
-	sha256sums_x86_64 = 8e31e7aa5c7a5280ec7a1f3ba456734fdc24cb2969a4b07af41b628459695a2c
+	sha256sums = 8ba730272708717fa8b85d1c7d20887f33c9ce14979e2539dd73f165f351a712
+	sha256sums = 3411a4437077c5d10d3a5fbf79853c33c52ac66b565e0f94d10e7483e864a8bd
 
 pkgname = notepadpp
+	pkgdesc = A free source code editor for windows (64-bit)
+	arch = x86_64
+	provides = notepadpp
+	conflicts = notepadpp-win32
+
+pkgname = notepadpp-win32
+	pkgdesc = A free source code editor for windows (32-bit)
+	arch = x86_64
+	provides = notepadpp
+	conflicts = notepadpp
 
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"
diff --git a/notepadpp b/notepadpp
index eb1bfb9b09a1..052f41dedf3a 100644
--- a/notepadpp
+++ b/notepadpp
@@ -1,32 +1,36 @@
 #!/usr/bin/env sh
 
-wineapp="notepadpp"
+appver="7.6-1"
+pkgdir="/usr/share/notepadpp"
+localdir="$HOME/.local/share/notepadpp"
 
-pkgdir="/usr/share/$wineapp"
-localdir="$HOME/.local/share/$wineapp"
+curr_ver="$(cat "$localdir/notepadpp.ver")"
 
 unset WINEPREFIX
 
-if [ ! -d "$localdir" ] ; then
-    mkdir -p "$localdir"
+if [ ! -d "$localdir" ]; then
+    mkdir -p "$localdir" || { echo "Can't create directory"; exit 1; }
 
-    cp -rs "$pkgdir/plugins" "$localdir/plugins"
-    cp -rs "$pkgdir/themes" "$localdir/themes"
-    cp -rs "$pkgdir/localization" "$localdir/localization"
-
-    cp -r "$pkgdir/contextMenu.xml" "$localdir/contextMenu.xml"
-    cp -r "$pkgdir/doLocalConf.xml" "$localdir/doLocalConf.xml"
-    cp -r "$pkgdir/functionList.xml" "$localdir/functionList.xml"
-    cp -r "$pkgdir/langs.model.xml" "$localdir/langs.model.xml"
-    cp -r "$pkgdir/shortcuts.xml" "$localdir/shortcuts.xml"
-    cp -r "$pkgdir/stylers.model.xml" "$localdir/stylers.model.xml"
+    cp "$pkgdir/contextMenu.xml" "$localdir/contextMenu.xml"
+    cp "$pkgdir/doLocalConf.xml" "$localdir/doLocalConf.xml"
+    cp "$pkgdir/functionList.xml" "$localdir/functionList.xml"
+    cp "$pkgdir/langs.model.xml" "$localdir/langs.model.xml"
+    cp "$pkgdir/shortcuts.xml" "$localdir/shortcuts.xml"
+    cp "$pkgdir/stylers.model.xml" "$localdir/stylers.model.xml"
 
     ln -s "$pkgdir/notepad++.exe" "$localdir/notepadpp"
     ln -s "$pkgdir/SciLexer.dll" "$localdir/SciLexer.dll"
 
     ln -s "$pkgdir/change.log" "$localdir/change.log"
     ln -s "$pkgdir/readme.txt" "$localdir/readme.txt"
+    touch "$localdir/notepadpp.ver"
 fi
 
-WINEDEBUG=-all wine "$HOME/.local/share/notepadpp/notepadpp" "$@"
+if [ ! "$appver" = "$curr_ver" ]; then
+    cp -rs "$pkgdir/plugins" "$localdir/plugins"
+    cp -rs "$pkgdir/themes" "$localdir/themes"
+    cp -rs "$pkgdir/localization" "$localdir/localization"
+    echo "$appver" > "$localdir/notepadpp.ver"
+fi
 
+WINEDEBUG=-all wine "$HOME/.local/share/notepadpp/notepadpp" "$@"