Date: 27 Oct 1997 23:37:17 -0000 From: vanilla@MinJe.com.TW To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/4869: Update gtk to 971025 Message-ID: <19971027233717.3937.qmail@MinJe.com.TW> Resent-Message-ID: <199710272350.PAA07030@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 4869 >Category: ports >Synopsis: update gtk to current version >Confidential: yes >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 27 15:50:01 PST 1997 >Last-Modified: >Originator: Vanill I. Shu >Organization: Cray running FreeBSD >Release: FreeBSD 3.0-CURRENT i386 >Environment: >Description: update gtk to 971025, it need by gimp-0.99.15, >How-To-Repeat: >Fix: diff -ruN gtk.orig/Makefile gtk/Makefile --- gtk.orig/Makefile Thu Oct 16 00:07:01 1997 +++ gtk/Makefile Tue Oct 28 06:02:54 1997 @@ -1,13 +1,13 @@ # New ports collection makefile for: gtk -# Version required: 970925 +# Version required: 971025 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $Id: Makefile,v 1.1.1.1 1997/10/15 16:07:01 erich Exp $ # -DISTNAME= gtk+970925 -PKGNAME= gtk-970925 +DISTNAME= gtk+971025 +PKGNAME= gtk-971025 CATEGORIES= x11 MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/ diff -ruN gtk.orig/files/md5 gtk/files/md5 --- gtk.orig/files/md5 Thu Oct 16 00:07:02 1997 +++ gtk/files/md5 Tue Oct 28 06:02:37 1997 @@ -1 +1 @@ -MD5 (gtk+970925.tar.gz) = 0bbb0f2fc262a529f59c0ea3a496afac +MD5 (gtk+971025.tar.gz) = 1fc37150549062622866600b4a78aaa5 diff -ruN gtk.orig/patches/patch-aa gtk/patches/patch-aa --- gtk.orig/patches/patch-aa Thu Oct 16 00:07:03 1997 +++ gtk/patches/patch-aa Sat Oct 18 09:22:31 1997 @@ -8,28 +8,6 @@ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo "configure:566: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then ---- ./gdk/Makefile.in.orig Sun Oct 12 15:48:17 1997 -+++ ./gdk/Makefile.in Sun Oct 12 15:47:48 1997 -@@ -153,7 +153,7 @@ - gxid_OBJECTS = gxid.o - gxid_DEPENDENCIES = - gxid_LDFLAGS = --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ -DX_LOCALE - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) - LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ---- ./gdk/gdk.c.orig Sun Oct 12 15:49:46 1997 -+++ ./gdk/gdk.c Sun Oct 12 15:49:54 1997 -@@ -18,7 +18,7 @@ - #include "../config.h" - - #include <ctype.h> --#include <locale.h> -+#include <X11/Xlocale.h> - #include <signal.h> - #include <stdio.h> - #include <stdlib.h> --- ./docs/Makefile.in.orig Sun Oct 12 15:50:23 1997 +++ ./docs/Makefile.in Sun Oct 12 15:50:50 1997 @@ -116,7 +116,7 @@ diff -ruN gtk.orig/patches/patch-ab gtk/patches/patch-ab --- gtk.orig/patches/patch-ab Thu Oct 16 00:07:03 1997 +++ gtk/patches/patch-ab Tue Oct 28 07:21:55 1997 @@ -1,18 +1,22 @@ ---- gdk/gdkimage.c.orig Tue Oct 14 21:19:32 1997 -+++ gdk/gdkimage.c Tue Oct 14 21:19:53 1997 -@@ -232,14 +232,13 @@ +--- gtk/Makefile.in.orig Tue Oct 28 07:20:51 1997 ++++ gtk/Makefile.in Tue Oct 28 07:21:10 1997 +@@ -240,7 +240,7 @@ + gtkwindow.h \ + gtktypebuiltins.h - return NULL; - } -- else -- shmctl (x_shm_info->shmid, IPC_RMID, 0); +-libgtk_la_LDFLAGS = -version-info 1:0:0 -lgdk -lglib ++libgtk_la_LDFLAGS = -version-info 1:0:0 - gdk_error_code = 0; - gdk_error_warnings = 0; + EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc \ + gtk.defs runelisp gentypeinfo.el gtktypebuiltins.c +--- gdk/Makefile.in.orig Sat Oct 25 14:19:55 1997 ++++ gdk/Makefile.in Tue Oct 28 07:16:06 1997 +@@ -105,7 +105,7 @@ + gxid_proto.h \ + gdkx.h - XShmAttach (private->xdisplay, x_shm_info); - XSync (private->xdisplay, False); -+ shmctl (x_shm_info->shmid, IPC_RMID, 0); +-libgdk_la_LDFLAGS = -version-info 1:0:0 -lglib @x_ldflags@ @x_libs@ ++libgdk_la_LDFLAGS = -version-info 1:0:0 @x_ldflags@ @x_libs@ + + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib @x_cflags@ - gdk_error_warnings = 1; - if (gdk_error_code == -1) diff -ruN gtk.orig/pkg/PLIST gtk/pkg/PLIST --- gtk.orig/pkg/PLIST Thu Oct 16 17:41:43 1997 +++ gtk/pkg/PLIST Tue Oct 28 07:25:04 1997 @@ -1,10 +1,12 @@ -lib/libglib.so.1.0 lib/libglib.la +lib/libglib.so.1.0 +lib/libglib.so lib/libglib.a include/glib.h include/glibconfig.h lib/libgdk.la lib/libgdk.so.1.0 +lib/libgdk.so lib/libgdk.a include/gdk/gdk.h include/gdk/gdkcursors.h @@ -21,6 +23,7 @@ include/gdk/gdkx.h lib/libgtk.la lib/libgtk.so.1.0 +lib/libgtk.so lib/libgtk.a include/gtk/gtk.h include/gtk/gtkaccelerator.h >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19971027233717.3937.qmail>