initial import of xfvnc-git 0.r100.g31c1e02-4

4 files changed, 151 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..f75178eeedab
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,25 @@
+pkgbase = xfvnc-git
+	pkgdesc = A simple graphical VNC client - git checkout
+	pkgver = 0.r100.g31c1e02
+	pkgrel = 4
+	url = http://spurint.org/projects/xfvnc/
+	arch = i686
+	arch = x86_64
+	license = GPL
+	makedepends = pkgconfig
+	makedepends = xfce4-dev-tools
+	makedepends = git
+	makedepends = autoconf
+	depends = libxfce4ui
+	depends = gtk-vnc
+	provides = xfvnc
+	conflicts = xfvnc
+	source = git://git.xfce.org/apps/xfvnc
+	source = 0001-autoconf.patch
+	source = 0002-compile-against-libxfce4ui.patch
+	sha256sums = SKIP
+	sha256sums = a9266304c782fa4d73527fe5367081e1f4da7850a305fd9adc06f98db4ea0dda
+	sha256sums = 5ded010bf5f684901a55fcbb9620d2a191fc130f857be3606e62add3a4f7779b
+
+pkgname = xfvnc-git
+
diff --git a/0001-autoconf.patch b/0001-autoconf.patch
new file mode 100644
index 000000000000..e2df46495c6d
--- /dev/null
+++ b/0001-autoconf.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac.in b/configure.ac.in
+index 03e0471..9cfdc45 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -19,7 +19,7 @@ AC_PREREQ([2.50])
+ 
+ dnl init automake
+ AM_INIT_AUTOMAKE([dist-bzip2])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ dnl AC_DEFINE([WEBSITE], ["http://spuriousinterrupt.org/projects/xfvnc"],
+ dnl           [Location of the xfvnc website])
+ AM_MAINTAINER_MODE
diff --git a/0002-compile-against-libxfce4ui.patch b/0002-compile-against-libxfce4ui.patch
new file mode 100644
index 000000000000..7d5ebac627d5
--- /dev/null
+++ b/0002-compile-against-libxfce4ui.patch
@@ -0,0 +1,62 @@
+From acf09ceea694ba046816c46cada28f661bdf4d7e Mon Sep 17 00:00:00 2001
+From: Christian Hesse <eworm@leda.eworm.de>
+Date: Fri, 6 Mar 2015 14:09:37 +0100
+Subject: [PATCH 1/1] compile against libxfce4ui
+
+---
+ configure.ac.in   |  2 +-
+ xfvnc/Makefile.am |  4 +--
+ xfvnc/main.c      |  2 +-
+ 4 files changed, 5 insertions(+), 95 deletions(-)
+ delete mode 100644 po/xfvnc.pot
+
+diff --git a/configure.ac.in b/configure.ac.in
+index 03e0471..9cfdc45 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -53,7 +53,7 @@ dnl XDT_CHECK_LIBX11_REQUIRE
+ dnl required
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
+ XDT_CHECK_PACKAGE([LIBGLADE], [libglade-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([GTK_VNC], [gtk-vnc-1.0], [0.2.0])
+ 
+diff --git a/xfvnc/Makefile.am b/xfvnc/Makefile.am
+index bad6c7c..212a3d6 100644
+--- a/xfvnc/Makefile.am
++++ b/xfvnc/Makefile.am
+@@ -7,14 +7,14 @@ xfvnc_SOURCES = \
+ xfvnc_CFLAGS = \
+ 	-DLOCALEDIR=\"$(localedir)\" \
+ 	$(LIBXFCE4UTIL_CFLAGS) \
+-	$(LIBXFCEGUI4_CFLAGS) \
++	$(LIBXFCE4UI_CFLAGS) \
+ 	$(GTK_CFLAGS) \
+ 	$(LIBGLADE_CFLAGS) \
+ 	$(GTK_VNC_CFLAGS)
+ 
+ xfvnc_LDADD = \
+ 	$(LIBXFCE4UTIL_LIBS) \
+-	$(LIBXFCEGUI4_LIBS) \
++	$(LIBXFCE4UI_LIBS) \
+ 	$(GTK_LIBS) \
+ 	$(LIBGLADE_LIBS) \
+ 	$(GTK_VNC_LIBS)
+diff --git a/xfvnc/main.c b/xfvnc/main.c
+index fdbe950..4270e11 100644
+--- a/xfvnc/main.c
++++ b/xfvnc/main.c
+@@ -33,7 +33,7 @@
+ #include <glade/glade.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include <vncdisplay.h>
+ 
+-- 
+2.3.1
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..ef364d839000
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer: Christian Hesse <mail@eworm.de>
+
+pkgname=xfvnc-git
+pkgver=0.r100.g31c1e02
+pkgrel=4
+pkgdesc='A simple graphical VNC client - git checkout'
+arch=('i686' 'x86_64')
+url='http://spurint.org/projects/xfvnc/'
+license=('GPL')
+provides=('xfvnc')
+conflicts=('xfvnc')
+depends=('libxfce4ui' 'gtk-vnc')
+makedepends=('pkgconfig' 'xfce4-dev-tools' 'git' 'autoconf')
+source=('git://git.xfce.org/apps/xfvnc'
+	'0001-autoconf.patch'
+	'0002-compile-against-libxfce4ui.patch')
+sha256sums=('SKIP'
+            'a9266304c782fa4d73527fe5367081e1f4da7850a305fd9adc06f98db4ea0dda'
+            '5ded010bf5f684901a55fcbb9620d2a191fc130f857be3606e62add3a4f7779b')
+
+pkgver() {
+	cd xfvnc/
+
+	if GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"; then
+		echo "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG}).r$(git rev-list --count ${GITTAG}..).g$(git log -1 --format="%h")"
+	else
+		echo "0.r$(git rev-list --count master).g$(git log -1 --format="%h")"
+	fi
+}
+
+prepare() {
+	cd xfvnc/
+
+	patch -Np1 < "${srcdir}/0001-autoconf.patch"
+	patch -Np1 < "${srcdir}/0002-compile-against-libxfce4ui.patch"
+}
+
+build() {
+	cd xfvnc/
+
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac.in
+	./autogen.sh --prefix=/usr
+	MAKEFLAGS="" make
+}
+
+package() {
+	cd xfvnc/
+
+	make DESTDIR="${pkgdir}" install
+}
+