Updated to 0.3.r239.gf11a68d

4 files changed, 71 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c05f6ad4c18..dbbe8a426e26 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,25 @@
+# Generated by mksrcinfo v8
+# Sat Jan 16 15:43:16 UTC 2016
 pkgbase = liri-browser-git
 	pkgdesc = A Web Browser using the QML Material framework from the Papyros Project
-	pkgver = 0.3.r226.g3dc9792
+	pkgver = 0.3.r239.gf11a68d
 	pkgrel = 1
-	url = https://github.com/liri-browser/liri-browser
-	install = liri-browser-git.install
+	url = https://github.com/liri-project/liri-browser
+	install = liri-browser.install
 	arch = i686
 	arch = x86_64
 	license = GPLv3
 	makedepends = git
 	depends = qt5-base
 	depends = qt5-webengine
-	depends = qml-material
 	depends = qt5-multimedia
-	depends = libvlc-qt-git
+	depends = qml-material-git
 	provides = liri-browser
-	provides = liri-browser-git
 	conflicts = liri-browser
-	source = liri-browser-git::git+https://github.com/liri-project/liri-browser.git
+	source = liri-browser::git+https://github.com/liri-project/liri-browser.git
 	source = liri-browser.sh
 	source = liri-browser.desktop
-	source = liri-browser-git.install
+	source = liri-browser.install
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index a7edeec3dab7..f1ab6a85023d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,60 +1,59 @@
 # Maintainer: Riley Trautman <asonix.dev@gmail.com>
 
 _pkgname=liri-browser
-pkgname=$_pkgname-git
-pkgver=0.3.r226.g3dc9792
+pkgname=${_pkgname}-git
+pkgver=0.3.r239.gf11a68d
 pkgrel=1
 pkgdesc="A Web Browser using the QML Material framework from the Papyros Project"
 arch=("i686" "x86_64")
-url="https://github.com/liri-browser/liri-browser"
+url="https://github.com/liri-project/liri-browser"
 license=("GPLv3")
-depends=("qt5-base" "qt5-webengine" "qml-material" "qt5-multimedia"
-         "libvlc-qt-git")
+depends=("qt5-base" "qt5-webengine" "qt5-multimedia" "qml-material-git")
 makedepends=("git")
-provides=("$_pkgname" "$pkgname")
-conflicts=("$_pkgname")
-install=$pkgname.install
-source=("$pkgname::git+https://github.com/liri-project/liri-browser.git"
-        "liri-browser.sh" "liri-browser.desktop" "$pkgname.install")
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
+install=${_pkgname}.install
+source=("${_pkgname}::git+https://github.com/liri-project/liri-browser.git"
+"liri-browser.sh" "liri-browser.desktop" "liri-browser.install")
 sha256sums=("SKIP" "SKIP" "SKIP" "SKIP")
 
 pkgver() {
-    cd "$pkgname"
-    # cutting off 'foo-' prefix that presents in the git tag
-    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "${_pkgname}"
+  # cutting off 'foo-' prefix that presents in the git tag
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd "$srcdir/$pkgname"
-	qmake liri-browser.pro
-	make
+  cd "${_pkgname}"
+  qmake "liri-browser.pro"
+  make
 }
 
 package() {
-	cd "$srcdir/$pkgname"
-	make INSTALL_ROOT="$pkgdir" install
+  cd "${_pkgname}"
+  make INSTALL_ROOT="$pkgdir" install
 
   mkdir -p "$pkgdir"/usr/bin
   mkdir -p "$pkgdir"/usr/share/applications
 
   for i in 16x16 22x22 32x32 48x48 64x64 128x128 256x256; do
-    install -Dm644 "$srcdir"/"$pkgname"/icons/liri-browser.png \
-                   "$pkgdir"/usr/share/icons/hicolor/$i/apps/liri-browser.png
+    install -Dm644 "$srcdir"/"${_pkgname}"/icons/liri-browser.png \
+      "$pkgdir"/usr/share/icons/hicolor/$i/apps/liri-browser.png
   done
-  install -m755 "$srcdir"/liri-browser.sh \
-                "$pkgdir"/usr/bin/liri-browser
-  install -m755 "$srcdir"/liri-browser.desktop \
-                "$pkgdir"/usr/share/applications/liri-browser.desktop
+  install -m755 ../liri-browser.sh \
+    "$pkgdir"/usr/bin/liri-browser
+  install -m755 ../liri-browser.desktop \
+    "$pkgdir"/usr/share/applications/liri-browser.desktop
 }
 
 # Additional functions to generate a changelog
 
 changelog() {
-    cd "$pkgname"
-    git log $1..HEAD --no-merges --format=" * %s"
+  cd "${_pkgname}"
+  git log $1..HEAD --no-merges --format=" * %s"
 }
 
 gitref() {
-    cd "$pkgname"
-    git rev-parse HEAD
+  cd "${_pkgname}"
+  git rev-parse HEAD
 }
diff --git a/liri-browser.desktop b/liri-browser.desktop
index ae77d10d58e3..f3ff434b2adc 100644
--- a/liri-browser.desktop
+++ b/liri-browser.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Liri
+Name=Liri Browser
 Comment=Browse the Internet
 Keywords=internet;browser;explore;web;
 GenericName=Web Browser
diff --git a/liri-browser.install b/liri-browser.install
new file mode 100644
index 000000000000..cd3b519abf28
--- /dev/null
+++ b/liri-browser.install
@@ -0,0 +1,35 @@
+# Colored makepkg-like functions
+msg_blue() {
+  printf "${blue}==>${bold} $1${all_off}\n"
+}
+
+note() {
+  printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
+}
+
+all_off="$(tput sgr0)"
+bold="${all_off}$(tput bold)"
+blue="${bold}$(tput setaf 4)"
+yellow="${bold}$(tput setaf 3)"
+
+_update() {
+  msg_blue "Updating desktop MIME database..."
+  update-desktop-database -q
+
+  msg_blue "Updating icon cache.."
+  xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+}
+
+post_install() {
+  _update
+  note "Custom flags should be put directly in: ~/.config/liri-flags.conf"
+  note "The launcher is called: 'liri-browser'"
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  _update
+}