tint2: 0.11 -> 0.12.8 adopted port

4 files changed, 58 insertions, 44 deletions

diff --git a/tint2/.footprint b/tint2/.footprint
index 426124959..5d27bc7df 100644
--- a/tint2/.footprint
+++ b/tint2/.footprint
@@ -5,6 +5,41 @@ drwxr-xr-x	root/root	usr/etc/
 drwxr-xr-x	root/root	usr/etc/xdg/
 drwxr-xr-x	root/root	usr/etc/xdg/tint2/
 -rw-r--r--	root/root	usr/etc/xdg/tint2/tint2rc
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/tint2.1.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/applications/
+-rw-r--r--	root/root	usr/share/applications/tint2.desktop
+drwxr-xr-x	root/root	usr/share/icons/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/tint2.svg
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/tint2.1.gz
+drwxr-xr-x	root/root	usr/share/tint2/
+-rw-r--r--	root/root	usr/share/tint2/default_icon.png
+-rw-r--r--	root/root	usr/share/tint2/horizontal-dark-opaque.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/horizontal-dark-transparent.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/horizontal-light-opaque.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/horizontal-light-transparent.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/icon_and_text_1.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/icon_and_text_2.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/icon_and_text_3.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/icon_and_text_4.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/icon_only_1.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/icon_only_2.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/icon_only_3.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/icon_only_4.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/icon_only_6.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/icon_only_7.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/text_only_1.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/text_only_2.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/text_only_3.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/text_only_4.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/text_only_5.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/text_only_6.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/vertical-dark-opaque.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/vertical-dark-transparent.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/vertical-light-opaque.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/vertical-light-transparent.tint2rc
+-rw-r--r--	root/root	usr/share/tint2/vertical-neutral-icons.tint2rc
diff --git a/tint2/.md5sum b/tint2/.md5sum
index 6a758da88..6069ca47b 100644
--- a/tint2/.md5sum
+++ b/tint2/.md5sum
@@ -1,2 +1 @@
-6cfcad028f1bd2f69812167f5395f890  add-power-now-support.patch
-6fc5731e7425125fa84a2add5cef4bff  tint2-0.11.tar.bz2
+6be3d17489c910a752b4c86e0e872ae3  tint2-0.12.8.tar.gz
diff --git a/tint2/Pkgfile b/tint2/Pkgfile
index 616159036..c0f58c20a 100644
--- a/tint2/Pkgfile
+++ b/tint2/Pkgfile
@@ -1,29 +1,28 @@
-# Description: Lightweight panel/taskbar
-# URL: http://tint2.googlecode.com
+# Description: Lightweight panel/taskbar.
+# URL: https://gitlab.com/o9000/tint2
 # Packager: Vitaly Sinilin, vs at kp4 dot ru
-# Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Depends on: cmake imlib2 pango
+# Maintainer: Danny Rawlins, crux at romster dot me
+# Depends on: cmake imlib2 librsvg ninja startup-notification xorg-libxdamage
 
 name=tint2
-version=0.11
-release=2
-source=(http://$name.googlecode.com/files/$name-$version.tar.bz2 \
-        add-power-now-support.patch)
+version=0.12.8
+release=1
+source=(http://crux.ster.zone/downloads/$name/$name-$version.tar.gz)
+#source=(https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=$version)
 
 build() {
-  cd $name-$version
+	cd tint2-0.12.8-*
 
-  patch -p0 -i $SRC/add-power-now-support.patch
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DENABLE_BATTERY=ON \
+		-DENABLE_EXAMPLES=OFF \
+		-DENABLE_TINT2CONF=OFF \
+		-DSYSCONFDIR=/usr/etc \
+		-G Ninja
 
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_BATTERY=ON \
-    -DENABLE_EXAMPLES=OFF \
-    -DENABLE_TINT2CONF=OFF \
-    -DMANDIR=/usr/man \
-    -DSYSCONFDIR=/usr/etc
+	ninja
+	DESTDIR=$PKG ninja install
 
-  make
-  make DESTDIR=$PKG install
-  rm -rf $PKG/usr/share
+	rm -rf $PKG/usr/share/{doc,locale}
 }
diff --git a/tint2/add-power-now-support.patch b/tint2/add-power-now-support.patch
deleted file mode 100644
index 5057043df..000000000
--- a/tint2/add-power-now-support.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -rup ../tint2-0.11.orig/src/battery/battery.c ./src/battery/battery.c
---- ../tint2-0.11.orig/src/battery/battery.c	2010-12-02 23:56:11.313403140 +0100
-+++ ./src/battery/battery.c	2010-12-02 23:57:22.266956142 +0100
-@@ -184,8 +184,14 @@ void init_battery()
- 		}
- 		g_free(path2);
- 	}
--	if (path_energy_now && path_energy_full) {
-+
-+	path_current_now = g_build_filename(battery_dir, "power_now", NULL);
-+	if (!g_file_test (path_current_now, G_FILE_TEST_EXISTS)) {
-+		g_free(path_current_now);
- 		path_current_now = g_build_filename(battery_dir, "current_now", NULL);
-+	}
-+
-+	if (path_energy_now && path_energy_full) {
- 		path_status = g_build_filename(battery_dir, "status", NULL);
- 
- 		// check file