Update ATK to the 1.4 series. This is a feature update and is required

by the upcoming Gnome 2.4 series.
This commit is contained in:
marcm 2003-09-23 06:09:53 +00:00
parent 76c569d7a1
commit 099ffc76f3
7 changed files with 91 additions and 188 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2003/04/17 06:05:45 marcm Exp $
# $OpenBSD: Makefile,v 1.6 2003/09/23 06:09:53 marcm Exp $
COMMENT= "accessibility toolkit used by gtk+"
DISTNAME= atk-1.2.2
DISTNAME= atk-1.4.0
CATEGORIES= devel
HOMEPAGE= http://www.gtk.org
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/atk/1.2/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/atk/1.4/}
EXTRACT_SUFX= .tar.bz2
MODULES= gettext
@ -22,7 +22,7 @@ LIB_DEPENDS= glib-2.0.0.0,gmodule-2.0.0.0,gobject-2.0.0.0::devel/glib2
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
# library version (major:minor)
LIBATK_VERSION= 0:5
LIBATK_VERSION= 0:7
SEPARATE_BUILD= simple
USE_GMAKE= Yes

View File

@ -1,3 +1,3 @@
MD5 (atk-1.2.2.tar.bz2) = 2c42e4322d1a199cdd7479fb1d09879c
RMD160 (atk-1.2.2.tar.bz2) = 66a4098ada6de6efd49a0d3a92387560481b4ec5
SHA1 (atk-1.2.2.tar.bz2) = 6962300aaef67f5052d9584cf3883aaf12f3c23a
MD5 (atk-1.4.0.tar.bz2) = e501dde880fb2bbe77e428cfa2ee25f6
RMD160 (atk-1.4.0.tar.bz2) = c935ea56a8a5ede6d019f163619a2ac5d2eaf9cf
SHA1 (atk-1.4.0.tar.bz2) = 58f5d7f939d8126dfc7036cd6234841692f511d2

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-atk_Makefile_in,v 1.2 2003/04/17 06:05:45 marcm Exp $
--- atk/Makefile.in.orig Mon Jan 20 01:29:35 2003
+++ atk/Makefile.in Thu Apr 10 09:05:43 2003
@@ -142,7 +142,7 @@ MAINTAINERCLEANFILES = atkmarshal.c
INCLUDES = -I$(top_srcdir) -DG_DISABLE_DEPRECATED @DEP_CFLAGS@ -DATKLOCALEDIR=\""$(atklocaledir)"\"
-LDFLAGS = -version-info $(LT_VERSION_INFO) $(export_symbols) $(no_undefined) @DEP_LIBS@
+LDFLAGS = -version-info $(LIBATK_VERSION) $(export_symbols) $(no_undefined) @DEP_LIBS@
libatkincludedir = $(includedir)/atk-1.0/atk

View File

@ -1,98 +0,0 @@
$OpenBSD: patch-configure,v 1.2 2003/04/17 06:05:45 marcm Exp $
--- configure.orig Mon Jan 20 01:11:25 2003
+++ configure Thu Apr 10 09:05:43 2003
@@ -4963,6 +4963,16 @@ newos6*)
lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
+openbsd*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ else
+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+ fi
+ ;;
+
osf3* | osf4* | osf5*)
# this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -5806,8 +5816,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
fi
# Allow CC to be a program name with arguments.
@@ -6395,7 +6412,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -6799,10 +6818,24 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
;;
os2*)
@@ -7283,9 +7316,19 @@ newsos6)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=no
+ need_version=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'

View File

@ -1,85 +1,93 @@
$OpenBSD: patch-ltmain_sh,v 1.3 2003/04/17 06:05:45 marcm Exp $
--- ltmain.sh.orig Wed Apr 17 06:06:13 2002
+++ ltmain.sh Tue Feb 25 15:26:16 2003
@@ -1037,6 +1037,17 @@ compiler."
$OpenBSD: patch-ltmain_sh,v 1.4 2003/09/23 06:09:53 marcm Exp $
--- ltmain.sh.orig 2003-05-23 01:59:21.000000000 -0700
+++ ltmain.sh 2003-09-05 15:43:15.000000000 -0700
@@ -1287,6 +1287,17 @@ EOF
continue
;;
+ -pthread)
+ case $host in
+ *-*-openbsd*)
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+ case $host in
+ *-*-openbsd*)
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+
-module)
module=yes
continue
@@ -1473,6 +1484,10 @@ compiler."
@@ -1958,6 +1969,19 @@ EOF
fi
continue
;;
+ -pthread)
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+ newdependency_libs="$deplib $newdependency_libs"
+ ;;
+ prog)
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ ;;
+ esac
+ continue
+ ;;
+
%DEPLIBS%)
alldeplibs=yes
continue
@@ -1714,11 +1729,6 @@ compiler."
continue
fi
@@ -2206,10 +2230,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
-
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
@@ -4412,40 +4422,6 @@ relink_command=\"$relink_command\""
# This is a shared library
# Warn about portability, can't link against -module's on some systems (darwin)
@@ -5696,40 +5716,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
test "$show" = : && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- $echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit 0
;;

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2003/04/17 06:05:45 marcm Exp $
lib/libatk-1.0.so.0.5
@comment $OpenBSD: PFRAG.shared,v 1.3 2003/09/23 06:09:53 marcm Exp $
lib/libatk-1.0.so.400.0
DYNLIBDIR(%D/lib)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2003/04/17 06:05:45 marcm Exp $
@comment $OpenBSD: PLIST,v 1.4 2003/09/23 06:09:53 marcm Exp $
include/atk-1.0/atk/atk-enum-types.h
include/atk-1.0/atk/atk.h
include/atk-1.0/atk/atkaction.h
@ -28,32 +28,37 @@ include/atk-1.0/atk/atkvalue.h
lib/libatk-1.0.a
lib/libatk-1.0.la
lib/pkgconfig/atk.pc
share/gtk-doc/html/atk/atk-atkstate.html
share/gtk-doc/html/atk/AtkAction.html
share/gtk-doc/html/atk/AtkComponent.html
share/gtk-doc/html/atk/AtkDocument.html
share/gtk-doc/html/atk/AtkEditableText.html
share/gtk-doc/html/atk/AtkGObjectAccessible.html
share/gtk-doc/html/atk/AtkHyperlink.html
share/gtk-doc/html/atk/AtkHypertext.html
share/gtk-doc/html/atk/AtkImage.html
share/gtk-doc/html/atk/AtkNoOpObject.html
share/gtk-doc/html/atk/AtkNoOpObjectFactory.html
share/gtk-doc/html/atk/AtkObject.html
share/gtk-doc/html/atk/AtkObjectFactory.html
share/gtk-doc/html/atk/AtkRegistry.html
share/gtk-doc/html/atk/AtkRelation.html
share/gtk-doc/html/atk/AtkRelationSet.html
share/gtk-doc/html/atk/AtkSelection.html
share/gtk-doc/html/atk/AtkStateSet.html
share/gtk-doc/html/atk/AtkStreamableContent.html
share/gtk-doc/html/atk/AtkTable.html
share/gtk-doc/html/atk/AtkText.html
share/gtk-doc/html/atk/AtkUtil.html
share/gtk-doc/html/atk/AtkValue.html
share/gtk-doc/html/atk/atk-AtkState.html
share/gtk-doc/html/atk/atk.devhelp
share/gtk-doc/html/atk/atk.html
share/gtk-doc/html/atk/atkaction.html
share/gtk-doc/html/atk/atkcomponent.html
share/gtk-doc/html/atk/atkdocument.html
share/gtk-doc/html/atk/atkeditabletext.html
share/gtk-doc/html/atk/atkgobjectaccessible.html
share/gtk-doc/html/atk/atkhyperlink.html
share/gtk-doc/html/atk/atkhypertext.html
share/gtk-doc/html/atk/atkimage.html
share/gtk-doc/html/atk/atknoopobject.html
share/gtk-doc/html/atk/atknoopobjectfactory.html
share/gtk-doc/html/atk/atkobject.html
share/gtk-doc/html/atk/atkobjectfactory.html
share/gtk-doc/html/atk/atkregistry.html
share/gtk-doc/html/atk/atkrelation.html
share/gtk-doc/html/atk/atkrelationset.html
share/gtk-doc/html/atk/atkselection.html
share/gtk-doc/html/atk/atkstateset.html
share/gtk-doc/html/atk/atkstreamablecontent.html
share/gtk-doc/html/atk/atktable.html
share/gtk-doc/html/atk/atktext.html
share/gtk-doc/html/atk/atkutil.html
share/gtk-doc/html/atk/atkvalue.html
share/gtk-doc/html/atk/book1.html
share/gtk-doc/html/atk/home.png
share/gtk-doc/html/atk/index.html
share/gtk-doc/html/atk/index.sgml
share/gtk-doc/html/atk/left.png
share/gtk-doc/html/atk/right.png
share/gtk-doc/html/atk/up.png
%%SHARED%%
@dirrm share/gtk-doc/html/atk
@comment @dirrm share/gtk-doc/html