summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMusikolo2015-10-19 23:36:26 -0500
committerMusikolo2015-10-19 23:36:26 -0500
commit6fc25ca308ecb66f852769d37f35d44d1c796536 (patch)
treeee8830e8744ed5c254704c7c30ad5e55ad83be59
parent9eed7192a5db5dc3859e57747551b30a5036f115 (diff)
downloadaur-6fc25ca308ecb66f852769d37f35d44d1c796536.tar.gz
Add support for i686 platform, plus Gnome and Xfce service menus
-rw-r--r--.SRCINFO27
-rw-r--r--PKGBUILD118
2 files changed, 114 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 36465be704f..98c21af5f91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
pkgbase = bcompare
- pkgdesc = Beyond Compare 4: Compare, sync, and merge files and folders
pkgver = 4.1.1.20615
- pkgrel = 2
+ pkgrel = 3
url = http://www.scootersoftware.com
- install = bcompare.install
arch = i686
arch = x86_64
groups = utility
@@ -18,8 +16,27 @@ pkgbase = bcompare
depends = libxrandr
depends = zlib
options = !strip
- source = http://www.scootersoftware.com/bcompare-4.1.1.20615..tar.gz
- sha256sums = 8ba8e7fdaa45f55df4a36a2d41708632cef2fde3166f18a4382f3a9eceaea8bb
+ source_i686 = http://www.scootersoftware.com/bcompare-4.1.1.20615.i386.tar.gz
+ sha256sums_i686 = ee3468ca8849559aad999a4c1c1375e8d6766033e27d28abd19387d66e43890d
+ source_x86_64 = http://www.scootersoftware.com/bcompare-4.1.1.20615.x86_64.tar.gz
+ sha256sums_x86_64 = 8ba8e7fdaa45f55df4a36a2d41708632cef2fde3166f18a4382f3a9eceaea8bb
pkgname = bcompare
+ pkgdesc = Beyond Compare 4: Compare, sync, and merge files and folders
+ install = bcompare.install
+ optdepends = bcompare-kde: KDE service menus for Beyond Compare 4
+ optdepends = bcompare-gnome: Gnome service menus for Beyond Compare 4
+ optdepends = bcompare-xfce: Xfce service menus for Beyond Compare 4
+
+pkgname = bcompare-kde
+ pkgdesc = KDE service menus for Beyond Compare 4
+ depends = bcompare
+
+pkgname = bcompare-gnome
+ pkgdesc = Gnome service menus for Beyond Compare 4
+ depends = bcompare
+
+pkgname = bcompare-xfce
+ pkgdesc = Xfce service menus for Beyond Compare 4
+ depends = bcompare
diff --git a/PKGBUILD b/PKGBUILD
index c6607f2bfa7..21e52ab49da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,49 +4,68 @@
# Contributor: Pierre-Fran├žois Gomez https://aur.archlinux.org/account/pef/
# Contributor: Shura https://aur.archlinux.org/account/shura/
# Contributor: Michael Hansen <zrax0111 gmail com>
+# Contributor: Wesley Chan https://aur.archlinux.org/account/Wesley_Chan
+
# Original PKGBUILD file from:
# - https://bbs.archlinux.org/viewtopic.php?pid=757428#p757428
# - http://www.scootersoftware.com/vbulletin/showpost.php?s=3c1f289bc76655230b49f440dbe17b53&p=26449&postcount=7
-pkgname=bcompare
+pkgbase=bcompare
+pkgname=('bcompare' 'bcompare-kde' 'bcompare-gnome' 'bcompare-xfce')
pkgver=4.1.1.20615
-pkgrel=2
-pkgdesc="Beyond Compare 4: Compare, sync, and merge files and folders"
+pkgrel=3
arch=('i686' 'x86_64')
url="http://www.scootersoftware.com"
license=('custom')
groups=('utility')
depends=('qt4' 'fontconfig' 'libsm' 'libxcursor' 'libxft' 'libxinerama' 'libxrandr' 'zlib')
makedepends=('sed')
-install=${pkgname}.install
-source=("http://www.scootersoftware.com/${pkgname}-${pkgver}.${CARCH}.tar.gz")
-sha256sums=('8ba8e7fdaa45f55df4a36a2d41708632cef2fde3166f18a4382f3a9eceaea8bb')
+source_x86_64=("http://www.scootersoftware.com/${pkgname}-${pkgver}.x86_64.tar.gz")
+source_i686=("http://www.scootersoftware.com/${pkgname}-${pkgver}.i386.tar.gz")
+sha256sums_x86_64=('8ba8e7fdaa45f55df4a36a2d41708632cef2fde3166f18a4382f3a9eceaea8bb')
+sha256sums_i686=('ee3468ca8849559aad999a4c1c1375e8d6766033e27d28abd19387d66e43890d')
options=('!strip') # Do not strip binaries because it breaks them down
-package() {
+ prepare() {
# Prepare the directory skeleton needed for install.sh
- mkdir -p "${pkgdir}/usr/share/applications"
- mkdir -p "${pkgdir}/usr/share/doc"
- mkdir -p "${pkgdir}/usr/share/mime/packages"
- mkdir -p "${pkgdir}/usr/share/pixmaps"
+ _install_dir="${srcdir}/install"
+ mkdir -p "${_install_dir}/usr/share/applications"
+ mkdir -p "${_install_dir}/usr/share/doc"
+ mkdir -p "${_install_dir}/usr/share/mime/packages"
+ mkdir -p "${_install_dir}/usr/share/pixmaps"
- # Set up service menus
- echo -n "Do you want to install KDE service menus globally? [Y/n] "
- read key
- if [ "$key" != "n" -a "$key" != "N" ]; then
- echo -n "Including KDE service menus in the package..."
- mkdir -p "${pkgdir}/usr/lib/kde4"
- mkdir -p "${pkgdir}/usr/share/kde4/services/"
- echo " Done!"
- else
- echo "KDE service menus will NOT be included in the package."
- fi
-
- # Apply some fixes on install.sh before run it
- cd ${pkgname}-${pkgver}
+ # Set up KDE service menus
+ mkdir -p "${_install_dir}/usr/lib/kde4"
+ mkdir -p "${_install_dir}/usr/share/kde4/services"
+
+ # Set up Gnome service menus
+ mkdir -p "${_install_dir}/usr/lib/nautilus/extensions-3.0"
+
+ # Set up Xfce service menus
+ mkdir -p "${_install_dir}/usr/lib/thunarx-2"
+
+ # Apply some fixes on install.sh script
+ cd "${pkgname}-${pkgver}"
sed -i 's|/usr/|${PREFIX}/usr/|g' install.sh
sed -i '/-h \/lib64/{N;N;d;}' install.sh
- sh install.sh --prefix="${pkgdir}"
+ }
+
+package_bcompare() {
+ pkgdesc="Beyond Compare 4: Compare, sync, and merge files and folders"
+ optdepends=('bcompare-kde: KDE service menus for Beyond Compare 4'
+ 'bcompare-gnome: Gnome service menus for Beyond Compare 4'
+ 'bcompare-xfce: Xfce service menus for Beyond Compare 4' )
+ install=${pkgname}.install
+
+ # Excecute install script - needs to be run here
+ cd "${pkgname}-${pkgver}"
+ _install_dir="${srcdir}/install"
+ sh install.sh --prefix="${_install_dir}"
+
+ # Prepare the directory skeleton needed for install.sh
+ cp -r "${_install_dir}/bin" "${pkgdir}/"
+ cp -r "${_install_dir}/lib" "${pkgdir}/"
+ cp -r "${_install_dir}/usr" "${pkgdir}/"
# Move some directories to usr
cd "${pkgdir}"
@@ -58,6 +77,12 @@ package() {
# Fix wrong paths
sed -i "s|"${pkgdir}"|/usr|g" usr/bin/bcompare
+ # Remove KDE, Gnome and Xfce files
+ rm -rf "${pkgdir}/usr/share/kde4"
+ rm -rf "${pkgdir}/usr/lib/kde4"
+ rm -rf "${pkgdir}/usr/lib/nautilus"
+ rm -rf "${pkgdir}/usr/lib/thunarx-2"
+
#Clean unneded files
pushd usr/lib/beyondcompare/ > /dev/null
rm -f uninstall.sh RPM-GPG-KEY-scootersoftware scootersoftware.repo kde_context_menu
@@ -73,3 +98,44 @@ package() {
mv packages mime/
popd > /dev/null
}
+
+package_bcompare-kde() {
+ pkgdesc="KDE service menus for Beyond Compare 4"
+ depends=('bcompare')
+
+ msg2 "Packaging KDE service menus..."
+ _install_dir="${srcdir}/install"
+ # Set up service menus
+ mkdir -p "${pkgdir}/usr/lib"
+ mkdir -p "${pkgdir}/usr/share"
+
+ mv "${_install_dir}/usr/lib/kde4" "${pkgdir}/usr/lib/"
+ mv "${_install_dir}/usr/share/kde4" "${pkgdir}/usr/share"
+ msg2 "Done!"
+}
+
+package_bcompare-gnome() {
+ pkgdesc="Gnome service menus for Beyond Compare 4"
+ depends=('bcompare')
+
+ msg2 "Packaging Gnome service menus..."
+ _install_dir="${srcdir}/install"
+ # Set up service menus
+ mkdir -p "${pkgdir}/usr/lib"
+
+ mv "${_install_dir}/usr/lib/nautilus" "${pkgdir}/usr/lib/"
+ msg2 "Done!"
+}
+
+package_bcompare-xfce() {
+ pkgdesc="Xfce service menus for Beyond Compare 4"
+ depends=('bcompare')
+
+ msg2 "Packaging Xfce service menus..."
+ _install_dir="${srcdir}/install"
+ # Set up service menus
+ mkdir -p "${pkgdir}/usr/lib"
+
+ mv "${_install_dir}/usr/lib/thunarx-2" "${pkgdir}/usr/lib/"
+ msg2 "Done!"
+} \ No newline at end of file