From: Paweł Stawicki Date: Thu, 12 Apr 2018 13:02:57 +0000 (+0200) Subject: Merge branch 'upstream/2.28.1' into tizen X-Git-Tag: accepted/tizen/5.0/unified/20181102.023841^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95c6bfacc141562877c761665ac8e29292abea90;p=platform%2Fupstream%2Fatk.git Merge branch 'upstream/2.28.1' into tizen Change-Id: I427be9a150d3d4274ec0d0d07ad4bcea1740f7cb --- 95c6bfacc141562877c761665ac8e29292abea90 diff --cc Makefile.am index 608dc7d,edc6976..4ce0379 --- a/Makefile.am +++ b/Makefile.am @@@ -1,7 -1,18 +1,18 @@@ # Process this file with automake to create Makefile.in. ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - SUBDIRS=atk tests docs build -SUBDIRS = atk tests docs po win32 ++SUBDIRS = atk tests win32 + + meson_dist_files = \ + meson_options.txt \ + meson.build \ + atk/meson.build \ + docs/meson.build \ + docs/xml/meson.build \ + docs/xml/gtkdocentities.ent.in \ + po/meson.build \ + tests/meson.build \ + $() EXTRA_DIST = \ MAINTAINERS \ @@@ -15,10 -23,6 +23,6 @@@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = atk.pc - DISTCHECK_CONFIGURE_FLAGS = -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection ++DISTCHECK_CONFIGURE_FLAGS = - DISTCLEANFILES = \ - atk-uninstalled.pc \ - atk.pc \ - atk.pc.spec \ - atk-zip.sh + DISTCLEANFILES = atk.pc diff --cc atk/atkcomponent.c index 9be4011,f0beb10..6c2c43f mode 100755,100644..100644 --- a/atk/atkcomponent.c +++ b/atk/atkcomponent.c diff --cc atk/atkcomponent.h index 1795dbf,d20fdc2..bfc0d9b mode 100755,100644..100644 --- a/atk/atkcomponent.h +++ b/atk/atkcomponent.h diff --cc atk/atkstate.h index f1ffccf,6a88567..e39d12c mode 100755,100644..100644 --- a/atk/atkstate.h +++ b/atk/atkstate.h diff --cc autogen.sh index b18261c,1dc2281..0cbcaf9 --- a/autogen.sh +++ b/autogen.sh @@@ -1,31 -1,38 +1,38 @@@ #!/bin/sh # Run this to generate all the initial makefiles, etc. - - test -n "$srcdir" || srcdir=`dirname "$0"` + test -n "$srcdir" || srcdir=$(dirname "$0") test -n "$srcdir" || srcdir=. - olddir=`pwd` - cd "$srcdir" + olddir=$(pwd) - if test -z $GTKDOCIZE; then - echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation." - rm -f gtk-doc.make - cat > gtk-doc.make <&2 + echo "*** If you wish to pass any to it, please specify them on the" >&2 + echo "*** '$0' command line." >&2 + echo "" >&2 fi - autoreconf --verbose --force --install -Wno-portability || exit 1 + aclocal --install || exit 1 -gtkdocize --copy || exit 1 ++#gtkdocize --copy || exit 1 + autoreconf --verbose --force --install || exit 1 cd "$olddir" + if [ "$NOCONFIGURE" = "" ]; then + $srcdir/configure "$@" || exit 1 - test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" + if [ "$1" = "--help" ]; then exit 0 else + echo "Now type 'make' to compile $PKG_NAME" || exit 1 + fi + else + echo "Skipping configure process." + fi diff --cc configure.ac index 4124d01,61e94c8..9d93352 --- a/configure.ac +++ b/configure.ac @@@ -191,14 -181,11 +181,11 @@@ AC_SUBST(GETTEXT_PACKAGE AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used]) - ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`" - AM_GLIB_GNU_GETTEXT - # Introspection support - #GOBJECT_INTROSPECTION_CHECK([0.6.7]) + GOBJECT_INTROSPECTION_CHECK([1.32.0]) # Documentation support - #GTK_DOC_CHECK([1.13]) -GTK_DOC_CHECK([1.25]) ++#GTK_DOC_CHECK([1.25]) # define a MAINT-like variable REBUILD which is set if Perl # and awk are found, so autogenerated sources can be rebuilt @@@ -261,22 -238,22 +238,20 @@@ AC_SUBST(ATK_HIDDEN_VISIBILITY_CFLAGS AC_CONFIG_FILES([ Makefile -po/Makefile.in atk.pc - atk-uninstalled.pc atk/Makefile atk/atk.rc atk/atkversion.h tests/Makefile - build/Makefile - build/win32/Makefile - build/win32/vs9/Makefile - build/win32/vs10/Makefile - build/win32/vs11/Makefile - build/win32/vs12/Makefile - docs/Makefile - docs/version.xml - atk.spec - atk-zip.sh + win32/Makefile + win32/vs9/Makefile + win32/vs9/atk-version-paths.vsprops + win32/vs10/Makefile + win32/vs10/atk-version-paths.props + win32/vs11/Makefile + win32/vs12/Makefile + win32/vs14/Makefile + win32/vs15/Makefile -docs/Makefile config.h.win32 ]) diff --cc packaging/atk.spec index 14ec17b,0000000..a3411fb mode 100644,000000..100644 --- a/packaging/atk.spec +++ b/packaging/atk.spec @@@ -1,89 -1,0 +1,90 @@@ +%define baseline 2.16 +Name: atk - Version: 2.16.0 ++Version: 2.28.1 +Release: 0 +License: LGPL-2.0+ +Summary: An Accessibility ToolKit +Url: http://www.gtk.org/ +Group: System/Libraries +Source: http://download.gnome.org/sources/%{name}/%{baseline}/%{name}-%{version}.tar.xz +Source98: baselibs.conf +Source1001: %{name}.manifest + +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: glib2-devel >= 2.35.2 +BuildRequires: intltool +BuildRequires: which ++BuildRequires: gobject-introspection +%if %{with introspection} +BuildRequires: gobject-introspection-devel +%endif +Requires: libatk + +%description +The ATK library provides a set of accessibility interfaces. By +supporting the ATK interfaces, an application or toolkit can be used +with screen readers, magnifiers, and alternate input devices. + +%package -n libatk +Summary: An Accessibility ToolKit +Group: System/Libraries +Provides: %{name} = %{version} +Obsoletes: %{name} < %{version} + +%description -n libatk +The ATK library provides a set of accessibility interfaces. By +supporting the ATK interfaces, an application or toolkit can be used +with screen readers, magnifiers, and alternate input devices. + +%package -n typelib-Atk +Summary: An Accessibility ToolKit -- Introspection bindings +Group: System/Libraries + +%description -n typelib-Atk +The ATK library provides a set of accessibility interfaces. By +supporting the ATK interfaces, an application or toolkit can be used +with screen readers, magnifiers, and alternate input devices. + +This package provides the GObject Introspection bindings for ATK. + +%package devel +Summary: Include Files and Libraries mandatory for Development +Group: Development/Libraries/GNOME +Requires: libatk = %{version} + +%description devel +This package contains all necessary include files and libraries needed +to develop applications that require these. + +%prep +%setup -q +cp %{SOURCE1001} . + +%build +%autogen \ + --disable-static +make %{?_smp_mflags} + +%install +%make_install +%fdupes %{buildroot} + +%post -n libatk -p /sbin/ldconfig + +%postun -n libatk -p /sbin/ldconfig + +%files -n libatk +%manifest %{name}.manifest +%defattr(-, root, root) +%doc COPYING +%license COPYING +%{_libdir}/lib*.so.* + +%files devel +%manifest %{name}.manifest +%defattr(-, root, root) +%{_includedir}/atk-1.0 +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/*.pc +