diff options
| author | Danny Rawlins <romster@shortcircuit.net.au> | 2008-08-16 22:29:41 +1000 |
|---|---|---|
| committer | Danny Rawlins <romster@shortcircuit.net.au> | 2008-08-16 22:29:41 +1000 |
| commit | a92249db163028271197f52aa74a0f2470191351 (patch) | |
| tree | 087ee48e3701e8ad6d7bba3a4b8f8f6e6bf92703 /tk | |
| parent | c1c8765224de4a8c5a37f7a25a9d9b8d448d79e1 (diff) | |
| download | contrib-a92249db163028271197f52aa74a0f2470191351.tar.gz contrib-a92249db163028271197f52aa74a0f2470191351.tar.xz | |
tk: 8.5.3 -> 8.5.4
Diffstat (limited to 'tk')
| -rw-r--r-- | tk/.md5sum | 3 | ||||
| -rw-r--r-- | tk/Pkgfile | 10 | ||||
| -rw-r--r-- | tk/tk-8.5.3-lastevent.patch | 26 |
3 files changed, 5 insertions, 34 deletions
diff --git a/tk/.md5sum b/tk/.md5sum index 01a943ee2..408c7f864 100644 --- a/tk/.md5sum +++ b/tk/.md5sum @@ -1,2 +1 @@ -d0d0bc79270702a016a1f51cd4bd02c9 tk-8.5.3-lastevent.patch -c7d2ef187d0f313850689cda20148ec3 tk8.5.3-src.tar.gz +a6aee7653566ec0b7c4b0f4c24a96f20 tk8.5.4-src.tar.gz diff --git a/tk/Pkgfile b/tk/Pkgfile index 351905027..4ff5903f2 100644 --- a/tk/Pkgfile +++ b/tk/Pkgfile @@ -5,14 +5,12 @@ # Depends on: xorg-libxft tcl name=tk -version=8.5.3 -release=2 -source=(http://dl.sourceforge.net/sourceforge/tcl/$name$version-src.tar.gz - $name-$version-lastevent.patch) +version=8.5.4 +release=1 +source=(http://dl.sourceforge.net/sourceforge/tcl/$name$version-src.tar.gz) build() { cd $name$version/unix - patch -d ../ -p 1 -i $SRC/$name-$version-lastevent.patch ./configure \ --prefix=/usr \ @@ -39,6 +37,6 @@ build() { ln -s wish${version%.*} $PKG/usr/bin/wish ln -s /usr/lib/libtk${version%.*}.so $PKG/usr/lib/libtk.so - chmod -R u+w $PKG/usr/man + chmod -c -R u+w $PKG/usr/man } diff --git a/tk/tk-8.5.3-lastevent.patch b/tk/tk-8.5.3-lastevent.patch deleted file mode 100644 index 9c67d5ac5..000000000 --- a/tk/tk-8.5.3-lastevent.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -pruN tk8.5.3.orig/generic/tk.h tk8.5.3/generic/tk.h ---- tk8.5.3.orig/generic/tk.h 2008-07-25 16:42:42.533614257 +1000 -+++ tk8.5.3/generic/tk.h 2008-07-25 16:46:22.831615277 +1000 -@@ -627,17 +627,15 @@ typedef struct Tk_GeomMgr { - *--------------------------------------------------------------------------- - */ - --#define VirtualEvent (LASTEvent) --#define ActivateNotify (LASTEvent + 1) --#define DeactivateNotify (LASTEvent + 2) --#define MouseWheelEvent (LASTEvent + 3) --#define TK_LASTEVENT (LASTEvent + 4) -+#define VirtualEvent (MappingNotify + 1) -+#define ActivateNotify (MappingNotify + 2) -+#define DeactivateNotify (MappingNotify + 3) -+#define MouseWheelEvent (MappingNotify + 4) -+#define TK_LASTEVENT (MappingNotify + 5) - - #define MouseWheelMask (1L << 28) -- - #define ActivateMask (1L << 29) - #define VirtualEventMask (1L << 30) --#define TK_LASTEVENT (LASTEvent + 4) - - /* - * A virtual event shares most of its fields with the XKeyEvent and |