OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tk?expand=0&rev=4

2008-04-06 02:03:20 +00:00
parent 551a8fe4e7
commit e63204a913
8 changed files with 124 additions and 145 deletions
--- a/tk.patch
+++ b/tk.patch
@@ -1,16 +1,6 @@
--- unix/Makefile.in
-+++ unix/Makefile.in
-@@ -113,7 +113,8 @@
- TK_PKG_DIR		= @TK_PKG_DIR@
- 
- # Directory in which to install the pkgIndex.tcl file for loadable Tk
-PKG_INSTALL_DIR		= $(LIB_INSTALL_DIR)/$(TK_PKG_DIR)
-+#PKG_INSTALL_DIR		= $(LIB_INSTALL_DIR)/$(TK_PKG_DIR)
-+PKG_INSTALL_DIR		= $(INSTALL_ROOT)/$(TK_LIBRARY)
- 
- # Package index file for loadable Tk
- PKG_INDEX		= $(PKG_INSTALL_DIR)/pkgIndex.tcl
-@@ -471,7 +472,8 @@
+Index: unix/Makefile.in
+===================================================================
+@@ -539,7 +540,8 @@ AQUA_XLIB_HDRS = $(XLIB_DIR)/X11/*.h $(X
 
 AQUA_PRIVATE_HDRS = $(MAC_OSX_DIR)/tkMacOSXPort.h $(MAC_OSX_DIR)/tkMacOSXInt.h
 
@@ -18,43 +8,5 @@
 +X11_PRIVATE_HDRS = $(UNIX_DIR)/tkUnixPort.h $(UNIX_DIR)/tkUnixInt.h \
 +	$(UNIX_DIR)/tkUnixDefault.h
 
- HDRS = bltList.h \
- 	default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h  \
-@@ -634,7 +636,7 @@
- 	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
- 	    echo "if {[package vcompare [package provide Tcl] $(TCLVERSION)] != 0} { return }";\
- 	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)\
-		[list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
-+		[list load $(TK_LIB_FILE) Tk]";\
- 	    ) > $(PKG_INDEX); \
- 	    fi
- 	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
--- unix/tcl.m4
-+++ unix/tcl.m4
-@@ -1124,7 +1124,7 @@
- 
- 	    # AIX v<=4.1 has some different flags than 4.2+
- 	    if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then
-		LIBOBJS="$LIBOBJS tclLoadAix.o"
-+		AC_LIBOBJ(tclLoadAix)
- 		DL_LIBS="-lld"
- 	    fi
- 
-@@ -1366,7 +1366,7 @@
- 	    # is kind of overkill but it works.
- 	    # Disable inlining only when one of the
- 	    # files in compat/*.c is being linked in.
-	    if test x"${LIBOBJS}" != x ; then
-+	    if test x"${LIBO@&t@BJS}" != x ; then
- 	        CFLAGS="$CFLAGS -fno-inline"
- 	    fi
- 
-@@ -2585,7 +2585,7 @@
- 		}], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy,
- 		    tcl_cv_strtod_buggy=buggy)])
- 	if test "$tcl_cv_strtod_buggy" = buggy; then
-	    LIBOBJS="$LIBOBJS fixstrtod.o"
-+	    AC_LIBOBJ([fixstrtod])
- 	    AC_DEFINE(strtod, fixstrtod)
- 	fi
-     fi
+ # Currently private, eventually public
+ TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h