diff options
| -rw-r--r-- | .AURINFO | 20 | ||||
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | PKGBUILD | 30 | ||||
| -rw-r--r-- | gnocl-canvas-0.9.95.patch | 140 |
4 files changed, 210 insertions, 0 deletions
diff --git a/.AURINFO b/.AURINFO new file mode 100644 index 000000000000..ac9edf1f9896 --- /dev/null +++ b/.AURINFO @@ -0,0 +1,20 @@ +pkgbase = gnocl-canvas + pkgdesc = Tcl/GTK+ bindings, GnoclCanvas module + pkgver = 0.9.95 + pkgrel = 1 + url = http://www.gnocl.org/ + arch = i686 + arch = x86_64 + license = custom + depends = gnocl + depends = tcl + depends = gtk2 + depends = libglade + depends = libgnomecanvas + source = https://launchpad.net/~dr-graef/+archive/gnocl.precise/+files/gnocl-canvas_0.9.95.orig.tar.gz + source = gnocl-canvas-0.9.95.patch + md5sums = 091225b21c23d112cb721fb2c16dec2f + md5sums = 4e40ef50e5f3df3330bda2278e402ebe + +pkgname = gnocl-canvas + diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..ac9edf1f9896 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,20 @@ +pkgbase = gnocl-canvas + pkgdesc = Tcl/GTK+ bindings, GnoclCanvas module + pkgver = 0.9.95 + pkgrel = 1 + url = http://www.gnocl.org/ + arch = i686 + arch = x86_64 + license = custom + depends = gnocl + depends = tcl + depends = gtk2 + depends = libglade + depends = libgnomecanvas + source = https://launchpad.net/~dr-graef/+archive/gnocl.precise/+files/gnocl-canvas_0.9.95.orig.tar.gz + source = gnocl-canvas-0.9.95.patch + md5sums = 091225b21c23d112cb721fb2c16dec2f + md5sums = 4e40ef50e5f3df3330bda2278e402ebe + +pkgname = gnocl-canvas + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..4f4bf4c5438a --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Albert Graef <aggraef@gmail.com> + +pkgname=gnocl-canvas +_pkgname=gnoclCanvas +pkgver=0.9.95 +pkgrel=1 +pkgdesc="Tcl/GTK+ bindings, GnoclCanvas module" +arch=("i686" "x86_64") +license=('custom') +url="http://www.gnocl.org/" +depends=('gnocl' 'tcl' 'gtk2' 'libglade' 'libgnomecanvas') +makedepends=() +source=("https://launchpad.net/~dr-graef/+archive/gnocl.precise/+files/${pkgname}_${pkgver}.orig.tar.gz" + "$pkgname-$pkgver.patch") +md5sums=('091225b21c23d112cb721fb2c16dec2f' + '4e40ef50e5f3df3330bda2278e402ebe') + +build() { + cd $srcdir/$_pkgname-$pkgver + patch -p1 < ../$pkgname-$pkgver.patch + cd src + chmod 0644 pkgIndex.tcl + make +} + +package() { + cd $srcdir/$_pkgname-$pkgver/src + make DESTDIR=$pkgdir install + install -D -m644 ../license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/gnocl-canvas-0.9.95.patch b/gnocl-canvas-0.9.95.patch new file mode 100644 index 000000000000..519cc5d8f482 --- /dev/null +++ b/gnocl-canvas-0.9.95.patch @@ -0,0 +1,140 @@ +diff -rupN gnoclCanvas-0.9.95.orig/demo/clockGadget.tcl gnoclCanvas-0.9.95/demo/clockGadget.tcl +--- gnoclCanvas-0.9.95.orig/demo/clockGadget.tcl 2010-04-21 00:37:20.000000000 +0200 ++++ gnoclCanvas-0.9.95/demo/clockGadget.tcl 2013-09-09 23:52:06.948384806 +0200 +@@ -1,4 +1,3 @@ +-# text_dump.tcl + #!/bin/sh + # the next line restarts using tclsh \ + exec tclsh "$0" "$@" +diff -rupN gnoclCanvas-0.9.95.orig/demo/test-canvas.tcl gnoclCanvas-0.9.95/demo/test-canvas.tcl +--- gnoclCanvas-0.9.95.orig/demo/test-canvas.tcl 2010-04-21 00:37:20.000000000 +0200 ++++ gnoclCanvas-0.9.95/demo/test-canvas.tcl 2013-09-09 23:52:06.948384806 +0200 +@@ -1,3 +1,7 @@ ++#!/bin/sh ++# the next line restarts using tclsh \ ++exec tclsh "$0" "$@" ++ + #--------------- + # canvastest.tcl + #--------------- +@@ -5,10 +9,6 @@ + # 02-Nov-2009 + #--------------- + +-#!/bin/sh +-# the next line restarts using tclsh \ +-exec tclsh "$0" "$@" +- + package require Gnocl + package require GnoclCanvas + +diff -rupN gnoclCanvas-0.9.95.orig/src/Makefile gnoclCanvas-0.9.95/src/Makefile +--- gnoclCanvas-0.9.95.orig/src/Makefile 2010-04-21 00:37:20.000000000 +0200 ++++ gnoclCanvas-0.9.95/src/Makefile 2013-09-09 23:52:59.955054391 +0200 +@@ -22,7 +22,7 @@ DEFINE:= "DEBUG_CANVAS" + CFLAGS += -pedantic -fPIC -w + + TCL_VERSION := $(shell echo 'puts $$tcl_version' | tclsh) +-GNOCL_VERSION := 0.9.95 ++GNOCL_VERSION := 0.9.96 + + ADDCFLAGS := -DVERSION=\"$(VERSION)\" \ + -DUSE_TCL_STUBS $(shell pkg-config --cflags gtk+-2.0 libgnomecanvas-2.0 ) \ +@@ -30,9 +30,18 @@ ADDCFLAGS := -DVERSION=\"$(VERSION)\" \ + -I/usr/include/libglade-2.0 \ + -I/usr/local/include + +-LIBS := $(shell pkg-config \ +- --libs gtk+-2.0 libglade-2.0 libgnomecanvas-2.0) \ +- -ltclstub$(TCL_VERSION) -lgnocl-$(GNOCL_VERSION) ++# Note that linking against libgnocl.a doesn't work, as there are some global ++# data structures in gnocl (e.g., the global widget hash table) which need to ++# be shared between gnocl and the different addon modules. To work around this ++# problem, we simply link against the installed gnocl.so Tcl module instead. ++ ++#LIBS := -Wl,--no-as-needed $(shell pkg-config \ ++# --libs gtk+-2.0 libglade-2.0 libgnomecanvas-2.0) \ ++# -ltclstub$(TCL_VERSION) -lgnocl-$(GNOCL_VERSION) ++ ++LIBS := /usr/lib/tcl8.6/gnocl$(GNOCL_VERSION)/gnocl.so \ ++ $(shell pkg-config --libs gtk+-2.0 libglade-2.0 libgnomecanvas-2.0) \ ++ -ltclstub$(TCL_VERSION) + + TGZDIR:= $(PACKAGE_NAME)-$(VERSION)$(SUFFIX) + TGZFILE:= $(PACKAGE_NAME)-$(VERSION)$(SUFFIX).tar.bz2 +@@ -70,15 +79,15 @@ clean: + rm -f $(GTK_OBJ) $(PACKAGE_NAME).so + + install: +- ./install.tcl $(PACKAGE_REQUIRE_NAME) $(VERSION) $(PACKAGE_NAME) install ++ ./install.tcl $(PACKAGE_REQUIRE_NAME) $(VERSION) $(PACKAGE_NAME) install $(DESTDIR) + + uninstall: +- ./install.tcl $(PACKAGE_REQUIRE_NAME) $(VERSION) $(PACKAGE_NAME) uninstall ++ ./install.tcl $(PACKAGE_REQUIRE_NAME) $(VERSION) $(PACKAGE_NAME) uninstall $(DESTDIR) + + test: + ( \ + cd ../demo; \ +- ./test-canvas.tcl; \ ++ ./test-canvas.tcl; \ + cd ../src; \ + ) + +diff -rupN gnoclCanvas-0.9.95.orig/src/install.tcl gnoclCanvas-0.9.95/src/install.tcl +--- gnoclCanvas-0.9.95.orig/src/install.tcl 2010-04-21 00:37:20.000000000 +0200 ++++ gnoclCanvas-0.9.95/src/install.tcl 2013-09-09 23:55:06.638394701 +0200 +@@ -36,13 +36,13 @@ proc date { {i date} } { + } + + # error checking +-if { $argc != 4 } { ++if { $argc < 4 || $argc > 5 } { + set name [file tail $argv0] + error "Wrong number of args.\nUsage: $name package version install/uninstall" + } + + # get parameters +-foreach {package version name what} $argv { break } ++foreach {package version name what dest} $argv { break } + + # get installation directory + set dir [info library] +@@ -51,7 +51,7 @@ set dir [info library] + set destDir [file join $dir $name$version] + switch -- $what { + "install" { +- if { [file exists $destDir] } { ++ if { [file exists $dest$destDir] } { + puts "$destDir exists already. Aborting installation." + exit -1 + } +@@ -70,20 +70,20 @@ switch -- $what { + puts $fp "package ifneeded $package $version \[list load \[file join \$dir $name.so\]\]" + close $fp + puts "Creating $destDir" +- file mkdir $destDir ++ file mkdir $dest$destDir + set files [glob *.so] + lappend files pkgIndex.tcl + foreach file $files { + puts "Copying $file" +- file copy $file $destDir ++ file copy $file $dest$destDir + } + } + "uninstall" { +- puts "Deleting $destDir" +- file delete -force $destDir +- } +- default { +- error "unknown type \"$what\" must be install, test or uninstall" +- } ++ puts "Deleting $destDir" ++ file delete -force $dest$destDir ++ } ++ default { ++ error "unknown type \"$what\" must be install, test or uninstall" ++ } + } + |