cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to tcl/tk 8.4

Browse Source 
add patch to deal with tk8.4 API change
ok brad@ naddy@
This commit is contained in:
jose 2003-12-27 23:40:18 +00:00
parent 7bc6e421e0
commit eb8e03ffd8
4 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/py-Imaging/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2003/09/23 15:29:41 sturm Exp $
# $OpenBSD: Makefile,v 1.18 2003/12/27 23:40:18 jose Exp $
COMMENT= "python imaging library"
COMMENT-examples= "examples for python imaging library"
@ -32,7 +32,7 @@ PYTHON_VER= 2.2
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= :python-tkinter-${PYTHON_VER}*:lang/python/${PYTHON_VER},-tkinter
LIB_DEPENDS= jpeg.62::graphics/jpeg \
tk83.1::x11/tk/8.3
tk84::x11/tk/8.4
MULTI_PACKAGES= -examples
SUBPACKAGE?=

6
graphics/py-Imaging/files/Setup
View File

@ -1,4 +1,4 @@
# $OpenBSD: Setup,v 1.3 2001/09/04 18:49:04 naddy Exp $
# $OpenBSD: Setup,v 1.4 2003/12/27 23:40:18 jose Exp $
#
# Setup file for the Imaging module
# =================================
@ -44,8 +44,8 @@ _imaging _imaging.c decode.c encode.c map.c display.c outline.c path.c \
_imagingtk _imagingtk.c \
-IlibImaging Tk/tkImaging.c \
-I@LOCALBASE@/include -L@LOCALBASE@/lib -ltcl83 -ltk83 \
-I@LOCALBASE@/include/tcl8.3 -I@LOCALBASE@/include/tk8.3 \
-I@LOCALBASE@/include -L@LOCALBASE@/lib -ltcl84 -ltk84 \
-I@LOCALBASE@/include/tcl8.4 -I@LOCALBASE@/include/tk8.4 \
-I@X11BASE@/include
-L@X11BASE@/lib -lX11

29
graphics/py-Imaging/patches/patch-Tk_tkImaging_c Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-Tk_tkImaging_c,v 1.1 2003/12/27 23:40:18 jose Exp $
--- Tk/tkImaging.c.orig 2003-12-21 23:13:39.000000000 -0500
+++ Tk/tkImaging.c 2003-12-21 23:18:58.000000000 -0500
@@ -162,7 +162,7 @@ PyImagingPhoto(ClientData clientdata, Tc
if (w > 0) {
run.width = w;
run.pixelPtr = s;
- Tk_PhotoPutBlock(photo, &run, x-w, y, run.width, 1);
+ Tk_PhotoPutBlock(photo, &run, x-w, y, run.width, 1, TK_PHOTO_COMPOSITE_SET);
}
w = 0;
}
@@ -172,14 +172,14 @@ PyImagingPhoto(ClientData clientdata, Tc
/* copy final run, if any */
run.width = w;
run.pixelPtr = s;
- Tk_PhotoPutBlock(photo, &run, x-w, y, run.width, 1);
+ Tk_PhotoPutBlock(photo, &run, x-w, y, run.width, 1, TK_PHOTO_COMPOSITE_SET);
}
}
} else
/* Copy opaque block to photo image, and leave the rest to TK */
- Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height);
+ Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height, TK_PHOTO_COMPOSITE_SET);
return TCL_OK;
}

10
graphics/py-Imaging/patches/patch-libImaging_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libImaging_Makefile_in,v 1.1 2002/03/23 23:34:04 matt Exp $
--- libImaging/Makefile.in.orig Mon Mar 18 09:44:29 2002
+++ libImaging/Makefile.in Mon Mar 18 09:46:32 2002
$OpenBSD: patch-libImaging_Makefile_in,v 1.2 2003/12/27 23:40:18 jose Exp $
--- libImaging/Makefile.in.orig 2002-03-10 11:57:40.000000000 -0500
+++ libImaging/Makefile.in 2003-12-21 23:07:20.000000000 -0500
@@ -30,7 +30,7 @@ LIBS= @LIBS@ @LIBM@
# Other things that are customizable but not by configure
@ -10,7 +10,7 @@ $OpenBSD: patch-libImaging_Makefile_in,v 1.1 2002/03/23 23:34:04 matt Exp $
OPT= @OPT@
#OPT= -g
CFLAGS= $(OPT) -I$(INCLDIR) -I$(JPEGINCLUDE) $(DEFS)
@@ -80,7 +80,7 @@ LIB= libImaging.a
@@ -81,7 +81,7 @@ LIB= libImaging.a
all: coretest $(LIB)
coretest: coretest.o $(LIB)
@ -19,7 +19,7 @@ $OpenBSD: patch-libImaging_Makefile_in,v 1.1 2002/03/23 23:34:04 matt Exp $
$(LIB): $& $(OBJS)
-rm -f $(LIB)
@@ -119,7 +119,7 @@ Imaging_wrap.c:
@@ -120,7 +120,7 @@ Imaging_wrap.c:
wrap -python -dnone Imaging.i
exercise: Imaging_wrap.c