Commit 5ae0b62c authored by Alexander Larsson's avatar Alexander Larsson

Switch to an xdg-app-builder based build

parent 4ae36151
gnome-sdk-helper
rpm-dependencies.P
packages/SOURCES/*.zip
packages/SOURCES/*.tgz
packages/SOURCES/*.tar.gz
packages/SOURCES/*.tar.xz
packages/SOURCES/*.tar.bz2
freedesktop-sdk-base
build
.xdg-app-builder
sdk
repo
packages/BUILD/
packages/BUILD_XXXXX/
packages/RPMS/
packages/SRPMS/
packages/rpmdb/
packages/BUILDROOT/
packages/gnome-platform/
packages/.*
gnome-sdk.tar.xz
gnome-sdk-rpmdb.tar.xz
gnome-platform.tar.xz
gnome-platform-rpmdb.tar.xz
gnome-sdk.tar.gz
gnome-sdk-rpmdb.tar.gz
gnome-debug-src.tar.gz
gnome-debug.tar.gz
gnome-platform.tar.gz
gnome-platform-rpmdb.tar.gz
gnome-platform-packages
freedesktop-platform-packages
freedesktop-platform-rpmdb.tar.gz
freedesktop-platform.tar.gz
freedesktop-sdk-rpmdb.tar.gz
freedesktop-sdk.tar.gz
freedesktop-debug-src.tar.gz
freedesktop-debug.tar.gz
*~
[submodule "freedesktop-sdk-images"]
path = freedesktop-sdk-images
url = git://anongit.freedesktop.org/xdg-app/freedesktop-sdk-images
NAME=gnome
ID=org.gnome
VERSION=3.18
ARCH=x86_64
IMAGEDIR=freedesktop-sdk-base/images/$(ARCH)
BASE_HASH=4f89712a14cf936d2afa6e8abae4a02738196c14
EXTRA_NAME=
DELTAS=
GPG_KEY=
GPG_HOME=
BASE_SPECS=$(wildcard freedesktop-sdk-images/specs/*.spec)
BASE_SPECS_BASENAME=$(notdir $(BASE_SPECS))
GNOME_SPECS=$(wildcard specs/*.spec)
GNOME_SPECS_BASENAME=$(notdir $(GNOME_SPECS))
# ALL_SPECS is all of GNOME_SPECS and the ones from BASE_SPECS that are not overridden by GNOME_SPECS
ALL_SPECS = $(addprefix freedesktop-sdk-images/specs/,$(filter-out $(GNOME_SPECS_BASENAME),$(BASE_SPECS_BASENAME))) $(GNOME_SPECS)
all: $(NAME)-$(VERSION)-platform.tar.gz $(NAME)-$(VERSION)-sdk.tar.gz
debug: $(NAME)-$(VERSION)-debug.tar.gz
include freedesktop-sdk-images/Makefile.inc
-include rpm-dependencies.P
$(SDK_BASE_IMAGE) $(PLATFORM_BASE_IMAGE) images:
if test ! -d freedesktop-sdk-base; then \
git clone git://anongit.freedesktop.org/xdg-app/freedesktop-sdk-base;\
fi
(cd freedesktop-sdk-base && \
git fetch origin && \
git checkout $(BASE_HASH) && \
make)
all: repo org.gnome.Sdk.json
rm -rf sdk
xdg-app-builder --ccache --require-changes --repo=repo --subject="build of org.freedesktop.Sdk, `date`" ${EXPORT_ARGS} sdk org.gnome.Sdk.json
repo:
ostree init --mode=archive-z2 --repo=repo
freedesktop-sdk-images/bin
\ No newline at end of file
freedesktop-sdk-images/buildhome/
\ No newline at end of file
--- .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py.orig 2014-05-12 12:36:46.776004776 +0200
+++ .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py 2014-05-12 12:36:53.994995779 +0200
@@ -169,7 +169,7 @@
conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False)
includes=[]
if conf.env.PYTHON_CONFIG:
- for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split():
+ for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
if(incstr.startswith('-I')or incstr.startswith('/I')):
incstr=incstr[2:]
if incstr not in includes:
#!/bin/sh
for i in freedesktop-sdk-images/specs/*.spec; do
if test -f specs/`basename $i`; then
diff -u $i specs/`basename $i`;
fi;
done
Subproject commit 30c8ff3444a71562d565cd0a98b9ea54486a1b79
[Runtime]
name=org.gnome.Platform/x86_64/3.16
runtime=org.gnome.Platform/x86_64/3.16
sdk=org.gnome.Sdk/x86_64/3.16
name=org.gnome.Platform
runtime=org.gnome.Platform/x86_64/master
sdk=org.gnome.Sdk/x86_64/master
[Extension org.freedesktop.Platform.GL]
version=1.2
......@@ -11,10 +11,6 @@ directory=lib/GL
version=1.2
directory=share/zoneinfo
[Extension org.gnome.Platform.Locale]
directory=share/runtime/locale
subdirectories=true
[Environment]
GI_TYPELIB_PATH=/app/lib/girepository-1.0
GST_PLUGIN_PATH=/app/lib/gstreamer-1.0
......
[Runtime]
name=org.gnome.Sdk/x86_64/3.16
runtime=org.gnome.Platform/x86_64/3.16
sdk=org.gnome.Sdk/x86_64/3.16
name=org.gnome.Sdk
runtime=org.gnome.Platform/x86_64/master
sdk=org.gnome.Sdk/x86_64/master
[Extension org.freedesktop.Platform.GL]
version=1.2
......@@ -11,16 +11,6 @@ directory=lib/GL
version=1.2
directory=share/zoneinfo
[Extension org.gnome.Sdk.Locale]
directory=share/runtime/locale
subdirectories=true
[Extension org.gnome.Debug]
directory=lib/debug
[Extension org.gnome.DebugSrc]
directory=src/debug
[Environment]
GI_TYPELIB_PATH=/app/lib/girepository-1.0
GST_PLUGIN_PATH=/app/lib/gstreamer-1.0
......
Index: a/js/src/config/milestone.pl
===================================================================
--- a/js/src/config/milestone.pl
+++ b/js/src/config/milestone.pl
@@ -55,7 +55,7 @@ $MILESTONE_FILE = "$TOPSRCDIR/config/mi
#
my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
-if (defined(@TEMPLATE_FILE)) {
+if (@TEMPLATE_FILE) {
my $TFILE;
foreach $TFILE (@TEMPLATE_FILE) {
This diff is collapsed.
diff -up waflib/Build.py.orig pycairo-1.10.0/.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Build.py
--- waflib/Build.py.orig 2015-11-03 19:40:47.691969757 +0100
+++ waflib/Build.py 2015-11-03 19:41:07.888153441 +0100
@@ -151,6 +151,7 @@ class BuildContext(Context.Context):
f.close()
self.init_dirs()
def store(self):
+ return
data={}
for x in SAVED_ATTRS:
data[x]=getattr(self,x)
%global actualname cantarell
%global fontname abattis-%{actualname}
%global fontconf 31-cantarell.conf
%global archivename1 Cantarell-Bold
%global archivename2 Cantarell-Regular
Name: %{fontname}-fonts
Version: 0.0.16
Release: 1%{?dist}
Summary: Cantarell, a Humanist sans-serif font family
Group: User Interface/X
License: OFL
URL: http://abattis.org/cantarell/
Source0: http://download.gnome.org/sources/%{actualname}-fonts/0.0/%{actualname}-fonts-%{version}.tar.xz
BuildArch: noarch
%description
Cantarell is a set of fonts designed by Dave Crossland.
It is a sans-serif humanist typeface family.
%prep
%setup -q -n %{actualname}-fonts-%{version}
%build
%install
install -m 0755 -d %{buildroot}%{_datadir}/fonts/abattis-cantarell
install -m 0644 -p otf/*.otf %{buildroot}%{_datadir}/fonts/abattis-cantarell
install -m 0755 -d %{buildroot}%{_sysconfdir}/fonts/conf.d \
%{buildroot}%{_datadir}/fontconfig/conf.avail
install -m 0644 -p fontconfig/31-cantarell.conf \
%{buildroot}%{_datadir}/fontconfig/conf.avail
ln -s %{_datadir}/fontconfig/conf.avail/31-cantarell.conf \
%{buildroot}%{_sysconfdir}/fonts/conf.d/31-cantarell.conf
%files
%defattr(0644,root,root,0755)
%doc COPYING NEWS README
%{_datadir}/fonts/abattis-cantarell
%{_datadir}/fontconfig/conf.avail/*
%{_sysconfdir}/fonts/conf.d/*
%changelog
* Mon Nov 24 2014 Alexander Larsson <alexl@redhat.com> - 0.0.16-1
- Add initial version
%global release_version %%(echo %{version} | awk -F. '{print $1"."$2}')
Name: adwaita-icon-theme
Version: 3.18.0
Release: 1%{?dist}
Summary: Adwaita icon theme
License: LGPLv3+ or CC-BY-SA
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/adwaita-icon-theme/%{release_version}/%{name}-%{version}.tar.xz
BuildArch: noarch
BuildRequires: freedesktop-sdk-base
BuildRequires: librsvg2
BuildRequires: gtk3-dev
BuildRequires: hicolor-icon-theme
Requires: adwaita-cursor-theme = %{version}-%{release}
%description
This package contains the Adwaita icon theme used by the GNOME desktop.
%package -n adwaita-cursor-theme
Summary: Adwaita cursor theme
%description -n adwaita-cursor-theme
The adwaita-cursor-theme package contains a modern set of cursors originally
designed for the GNOME desktop.
%package dev
Summary: Development files for %{name}
Requires: %{name} = %{version}-%{release}
%description dev
The %{name}-dev package contains the pkgconfig file for
developing applications that use %{name}.
%prep
%setup -q
%build
%configure
make %{?_smp_mflags}
%install
%make_install
touch $RPM_BUILD_ROOT%{_datadir}/icons/Adwaita/icon-theme.cache
%post
touch --no-create %{_datadir}/icons/Adwaita &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/Adwaita &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/Adwaita &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/Adwaita &>/dev/null || :
%files
%doc COPYING*
%{_datadir}/icons/Adwaita/8x8/
%{_datadir}/icons/Adwaita/16x16/
%{_datadir}/icons/Adwaita/22x22/
%{_datadir}/icons/Adwaita/24x24/
%{_datadir}/icons/Adwaita/32x32/
%{_datadir}/icons/Adwaita/48x48/
%{_datadir}/icons/Adwaita/64x64/
%{_datadir}/icons/Adwaita/96x96/
%{_datadir}/icons/Adwaita/256x256/
%{_datadir}/icons/Adwaita/scalable/
%{_datadir}/icons/Adwaita/scalable-up-to-32/
%{_datadir}/icons/Adwaita/index.theme
%ghost %{_datadir}/icons/Adwaita/icon-theme.cache
%files -n adwaita-cursor-theme
%doc COPYING*
%{_datadir}/icons/Adwaita/cursors/
%files dev
%{_datadir}/pkgconfig/adwaita-icon-theme.pc
%changelog
* Wed Nov 12 2014 Alexander Larsson <alexl@redhat.com> - 3.14.1-1
- Initial version based on F21
%global release_version %%(echo %{version} | awk -F. '{print $1"."$2}')
Name: at-spi2-atk
Version: 2.18.1
Release: 1%{?dist}
Summary: A GTK+ module that bridges ATK to D-Bus at-spi
Group: System Environment/Libraries
License: LGPLv2+
URL: http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
#VCS: git:git://git.gnome.org/at-spi-atk
Source0: http://download.gnome.org/sources/at-spi2-atk/%{release_version}/%{name}-%{version}.tar.xz
BuildRequires: freedesktop-sdk-base
BuildRequires: atk-dev
BuildRequires: at-spi2-core-dev
BuildRequires: dbus-dev
BuildRequires: dbus-glib-dev
BuildRequires: glib2-dev
Requires: atk%{?_isa} >= %{atk_version}
Requires: at-spi2-core%{?_isa} >= %{at_spi2_core_version}
%description
at-spi allows assistive technologies to access GTK-based
applications. Essentially it exposes the internals of applications for
automation, so tools such as screen readers, magnifiers, or even
scripting interfaces can query and interact with GUI controls.
This version of at-spi is a major break from previous versions.
It has been completely rewritten to use D-Bus rather than
ORBIT / CORBA for its transport protocol.
This package includes a gtk-module that bridges ATK to the new
D-Bus based at-spi.
%package dev
Summary: A GTK+ module that bridges ATK to D-Bus at-spi
Requires: %{name}%{?_isa} = %{version}-%{release}
%description dev
The %{name}-dev package includes the header files for the %{name} library.
%prep
%setup -q
%build
%configure
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libatk-bridge.la
rm $RPM_BUILD_ROOT%{_libdir}/libatk-bridge-2.0.la
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%doc COPYING AUTHORS README
%dir %{_libdir}/gtk-2.0
%dir %{_libdir}/gtk-2.0/modules
%{_libdir}/gtk-2.0/modules/libatk-bridge.so
%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
%{_libdir}/libatk-bridge-2.0.so.*
%files dev
%{_includedir}/at-spi2-atk/2.0/atk-bridge.h
%{_libdir}/libatk-bridge-2.0.so
%{_libdir}/pkgconfig/atk-bridge-2.0.pc
%changelog
* Wed Nov 12 2014 Alexander Larsson <alexl@redhat.com> - 2.14.1-1
- Initial version based on F21
%global release_version %%(echo %{version} | awk -F. '{print $1"."$2}')
Name: at-spi2-core
Version: 2.18.3
Release: 1%{?dist}
Summary: Protocol definitions and daemon for D-Bus at-spi
Group: System Environment/Libraries
License: LGPLv2+
URL: http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
Source0: http://download.gnome.org/sources/at-spi2-core/%{release_version}/%{name}-%{version}.tar.xz
BuildRequires: freedesktop-sdk-base
BuildRequires: dbus-dev
BuildRequires: dbus-glib-dev
BuildRequires: glib2-dev
BuildRequires: gobject-introspection-dev
BuildRequires: libXtst-dev
BuildRequires: libXext-dev
BuildRequires: libXi-dev
Requires: dbus
%description
at-spi allows assistive technologies to access GTK-based
applications. Essentially it exposes the internals of applications for
automation, so tools such as screen readers, magnifiers, or even
scripting interfaces can query and interact with GUI controls.
This version of at-spi is a major break from previous versions.
It has been completely rewritten to use D-Bus rather than
ORBIT / CORBA for its transport protocol.
%package dev
Summary: Development files and headers for at-spi2-core
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description dev
The at-spi2-core-dev package includes the header files and
API documentation for libatspi.
%prep
%setup -q
%build
autoreconf -v --install --force
%configure --with-dbus-daemondir=/bin
make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
%{find_lang} %{name}
rm $RPM_BUILD_ROOT%{_libdir}/libatspi.la
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f %{name}.lang
%doc COPYING AUTHORS README
%{_libexecdir}/at-spi2-registryd
%{_datadir}/dbus-1/accessibility-services/org.a11y.atspi.Registry.service
%{_sysconfdir}/at-spi2
%{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop
%{_libdir}/libatspi.so.*
%{_libdir}/girepository-1.0/Atspi-2.0.typelib
%{_libexecdir}/at-spi-bus-launcher
%{_datadir}/dbus-1/services/org.a11y.Bus.service
%files dev
%{_libdir}/libatspi.so
%{_datadir}/gtk-doc/html/libatspi
%{_datadir}/gir-1.0/Atspi-2.0.gir
%{_includedir}/at-spi-2.0
%{_libdir}/pkgconfig/atspi-2.pc
%changelog
* Wed Nov 12 2014 Alexander Larsson <alexl@redhat.com> - 2.14.1-1
- Initial version based on F21
%global release_version %%(echo %{version} | awk -F. '{print $1"."$2}')
Summary: Interfaces for accessibility support
Name: atk
Version: 2.18.0
Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
#VCS: git:git://git.gnome.org/atk
Source: http://download.gnome.org/sources/atk/%{release_version}/atk-%{version}.tar.xz
URL: http://developer.gnome.org/platform-overview/stable/atk
BuildRequires: freedesktop-sdk-base
BuildRequires: glib2-dev
BuildRequires: gobject-introspection-dev
%description
The ATK library provides a set of interfaces for adding accessibility
support to applications and graphical user interface toolkits. By
supporting the ATK interfaces, an application or toolkit can be used
with tools such as screen readers, magnifiers, and alternative input
devices.
%package dev
Summary: Development files for the ATK accessibility toolkit
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description dev
This package includes libraries, header files, and developer documentation
needed for development of applications or toolkits which use ATK.
%prep
%setup -q
%build
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
%configure $CONFIGFLAGS)
make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%find_lang atk10
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f atk10.lang
%doc README AUTHORS COPYING NEWS
%{_libdir}/libatk-1.0.so.*
%{_libdir}/girepository-1.0
%files dev
%{_libdir}/libatk-1.0.so
%{_includedir}/atk-1.0
%{_libdir}/pkgconfig/atk.pc
%{_datadir}/gtk-doc/html/atk
%{_datadir}/gir-1.0
%changelog
* Wed Nov 12 2014 Alexander Larsson <alexl@redhat.com> - 2.14.0-1
- Initial version based on F21
%global release_version %%(echo %{version} | awk -F. '{print $1"."$2}')
%define clutter_version 1.0
Name: clutter-gtk
Version: 1.6.6
Release: 1%{?dist}
Summary: A basic GTK clutter widget
Group: Development/Languages
License: LGPLv2+
URL: http://www.clutter-project.org
Source0: http://download.gnome.org/sources/clutter-gtk/%{release_version}/clutter-gtk-%{version}.tar.xz
BuildRequires: freedesktop-sdk-base
BuildRequires: gtk3-dev
BuildRequires: clutter-dev
BuildRequires: gobject-introspection-dev
%description
clutter-gtk is a library which allows the embedding of a Clutter
canvas (or "stage") into a GTK+ application, as well as embedding
GTK+ widgets inside the stage.
%package dev
Summary: Clutter-gtk development environment
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description dev
Header files and libraries for building a extension library for the
clutter-gtk.
%prep
%setup -q
%build
%configure
make %{?_smp_mflags} V=1
%install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
#Remove libtool archives.
find %{buildroot} -type f -name "*.la" -delete
%find_lang cluttergtk-1.0
%check
make check %{?_smp_mflags} V=1
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig