version 1.16-1

3 files changed, 24 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bb6863056f3..72900312b891 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
+# Generated by mksrcinfo v8
+# Mon Dec 14 18:50:34 UTC 2015
 pkgbase = flwm-tc
-	pkgdesc = Fast Light Window Manager (an enhanced version by the Tiny Core team)
-	pkgver = 1.14
-	pkgrel = 2
+	pkgdesc = Fast Light Window Manager
+	pkgver = 1.16
+	pkgrel = 1
 	url = http://flwm.sourceforge.net/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	depends = fltk
-	source = ftp://distro.ibiblio.org/pub/linux/distributions/tinycorelinux/4.x/x86/release/src/flwm-1.14.tgz
-	source = flwm-tc-FL_INTERNALS.patch
-	md5sums = 95db0e6f37ff04c7d070f02cc3d42799
-	md5sums = 9a54bf10ff1028e7a32b1a730d7de76d
+	provides = flwm
+	conflicts = flwm
+	source = https://github.com/bbidulock/flwm/releases/download/1.16/flwm-1.16.tgz
+	md5sums = 00f543bb1734a06eda4680ae86beef9d
 
 pkgname = flwm-tc
 
diff --git a/PKGBUILD b/PKGBUILD
index a039e9084258..c53d12374336 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,32 @@
-# Maintainer: Yi Dai <plmday_at_gmail_dot_com>
+# Maintainer: Brian Bidulock <bidulock@openss7.org>
+# Contributor: Yi Dai <plmday_at_gmail_dot_com>
 
 pkgname=flwm-tc
-pkgver=1.14
-pkgrel=2
-pkgdesc="Fast Light Window Manager (an enhanced version by the Tiny Core team)"
+_pkgname=flwm
+pkgver=1.16
+pkgrel=1
+pkgdesc="Fast Light Window Manager"
 arch=('i686' 'x86_64')
 url="http://flwm.sourceforge.net/"
 license=('GPL')
+provides=(${_pkgname})
+conflicts=(${_pkgname})
 depends=('fltk')
-source=(ftp://distro.ibiblio.org/pub/linux/distributions/tinycorelinux/4.x/x86/release/src/flwm-${pkgver}.tgz
-        ${pkgname}-FL_INTERNALS.patch)
-md5sums=('95db0e6f37ff04c7d070f02cc3d42799'
-         '9a54bf10ff1028e7a32b1a730d7de76d')
+source=(https://github.com/bbidulock/${_pkgname}/releases/download/${pkgver}/${_pkgname}-${pkgver}.tgz)
+md5sums=('00f543bb1734a06eda4680ae86beef9d')
 
 build() {
-  cd "${srcdir}/flwm-${pkgver}"
-  patch -uNp1 < ${startdir}/${pkgname}-FL_INTERNALS.patch
+  cd ${_pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/flwm-${pkgver}"
+  cd ${_pkgname}-${pkgver}
   install -Dm755 flwm "${pkgdir}/usr/bin/flwm"
   install -Dm644 flwm.1 "${pkgdir}/usr/share/man/man1/flwm.1"
+  install -Dm644 flwm.desktop "$pkgdir/usr/share/xsessions/flwm.desktop"
+  install -Dm644 logo.png "$pkgdir/usr/share/pixmaps/flwm.png"
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/flwm-tc-FL_INTERNALS.patch b/flwm-tc-FL_INTERNALS.patch
deleted file mode 100644
index da9d0c5cdb94..000000000000
--- a/flwm-tc-FL_INTERNALS.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Naur flwm-1.14/Frame.C flwm-1.14-2/Frame.C
---- flwm-1.14/Frame.C	2012-01-06 19:30:31.000000000 +0100
-+++ flwm-1.14-2/Frame.C	2012-02-18 13:44:18.221491337 +0100
-@@ -2,6 +2,9 @@
- // Some modifications by Michael A. Losh, tagged "ML" below, 
- // Last update: 2009-09-27
- 
-+#ifndef FL_INTERNALS
-+#define FL_INTERNALS
-+
- #include "config.h"
- #include "Frame.H"
- #include "Desktop.H"
-@@ -11,6 +14,7 @@
- #include <FL/fl_draw.H>
- #include "Rotated.H"
- 
-+#endif
- 
- static Atom wm_state = 0;
- static Atom wm_change_state;
-diff -Naur flwm-1.14/main.C flwm-1.14-2/main.C
---- flwm-1.14/main.C	2012-01-06 16:40:15.000000000 +0100
-+++ flwm-1.14-2/main.C	2012-02-18 13:46:02.974257177 +0100
-@@ -2,6 +2,9 @@
- // you can test the window controls.
- //#define TEST 1
- 
-+#ifndef FL_INTERNALS
-+#define FL_INTERNALS
-+
- #include "Frame.H"
- #include <X11/Xproto.h>
- #include <stdio.h>
-@@ -16,6 +19,9 @@
- 
- //ML
- #include <FL/fl_ask.H>
-+
-+#endif
-+
- #include <signal.h>
- 
- ////////////////////////////////////////////////////////////////
-diff -Naur flwm-1.14/Rotated.C flwm-1.14-2/Rotated.C
---- flwm-1.14/Rotated.C	2005-09-19 06:29:11.000000000 +0200
-+++ flwm-1.14-2/Rotated.C	2012-02-18 13:45:50.564324407 +0100
-@@ -26,12 +26,18 @@
- 
- /* ********************************************************************** */
- 
-+#ifndef FL_INTERNALS
-+#define FL_INTERNALS
-+
- #include <FL/x.H>
- #if FL_MAJOR_VERSION < 2
- # define XWindow Window
- #endif
- #include <FL/fl_draw.H>
- #include "Rotated.H"
-+
-+#endif
-+
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>