From 84f3611653eb34e892e6dfc172d64983a7f302c9a171963c0ae6e7bf632207b6 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 6 Jun 2017 13:10:15 +0000 Subject: [PATCH 1/3] - Make the build footprint smaller to enter ring1: This means we skip a couple tests though. Removed BuildRequires: java-devel, mono-core, mono-devel, wxWidgets-devel and pkgconfig(protobuf). OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=41 --- meson.changes | 7 +++++++ meson.spec | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/meson.changes b/meson.changes index 0200b1d..7ae65ab 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 6 13:08:19 UTC 2017 - dimstar@opensuse.org + +- Make the build footprint smaller to enter ring1: This means we + skip a couple tests though. Removed BuildRequires: java-devel, + mono-core, mono-devel, wxWidgets-devel and pkgconfig(protobuf). + ------------------------------------------------------------------- Wed May 17 20:26:25 UTC 2017 - dimstar@opensuse.org diff --git a/meson.spec b/meson.spec index d2acf49..c7629bf 100644 --- a/meson.spec +++ b/meson.spec @@ -46,10 +46,7 @@ BuildRequires: gettext BuildRequires: git BuildRequires: gtk-doc BuildRequires: itstool -BuildRequires: java-devel BuildRequires: libqt5-qtbase-devel -BuildRequires: mono-core -BuildRequires: mono-devel BuildRequires: ninja BuildRequires: pkgconfig BuildRequires: python3 >= 3.4 @@ -57,11 +54,9 @@ BuildRequires: python3-devel BuildRequires: python3-gobject BuildRequires: python3-setuptools BuildRequires: vala -BuildRequires: wxWidgets-devel >= 3.0.0 BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(protobuf) BuildRequires: pkgconfig(zlib) Requires: ninja # meson-gui was last used in openSUSE Leap 42.1. From eb05bad04841dff909741e8225cf7cfbb7c351eea86d2f3dd300d060ce114be0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 7 Jun 2017 09:27:51 +0000 Subject: [PATCH 2/3] Do not pull in gtk3 into the buildroot OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=42 --- meson.changes | 3 ++- meson.spec | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/meson.changes b/meson.changes index 7ae65ab..3fbeff1 100644 --- a/meson.changes +++ b/meson.changes @@ -3,7 +3,8 @@ Tue Jun 6 13:08:19 UTC 2017 - dimstar@opensuse.org - Make the build footprint smaller to enter ring1: This means we skip a couple tests though. Removed BuildRequires: java-devel, - mono-core, mono-devel, wxWidgets-devel and pkgconfig(protobuf). + mono-core, mono-devel, wxWidgets-devel, pkgconfig(protobuf) and + pkgconfig(gtk+-3.0). ------------------------------------------------------------------- Wed May 17 20:26:25 UTC 2017 - dimstar@opensuse.org diff --git a/meson.spec b/meson.spec index c7629bf..1cf9e85 100644 --- a/meson.spec +++ b/meson.spec @@ -56,7 +56,6 @@ BuildRequires: python3-setuptools BuildRequires: vala BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(zlib) Requires: ninja # meson-gui was last used in openSUSE Leap 42.1. @@ -79,10 +78,13 @@ Domain Specific Language. %patch2 -p1 %patch3 -p1 -# Lack of gtest, gmock, gnustep. -rm -rf "test cases/frameworks/2 gtest" \ - "test cases/frameworks/3 gmock/" \ - "test cases/objc/2 nsstring" +# Lack of gtest, gmock, gnustep, for the vala test, we'd need gtk3 which causes a build cycle +# but considering the GNOME stack is the main driver for meson and the GNOME team is maintaining +# also this build system, we will see issues in GNOME soon enough too +rm -rf "test cases/frameworks/2 gtest" \ + "test cases/frameworks/3 gmock/" \ + "test cases/objc/2 nsstring" \ + "test cases/vala/14 target glib version and gresources" %build python3 setup.py build From 40633d065d29929ad4bf660eb3da25f6475f03024b71f1859094711db2b73b3e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 7 Jun 2017 09:49:14 +0000 Subject: [PATCH 3/3] libqt5-qtbase-devel, mono-core, mono-devel, wxWidgets-devel, pkgconfig(protobuf) and pkgconfig(gtk+-3.0). OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=43 --- meson.changes | 4 ++-- meson.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.changes b/meson.changes index 3fbeff1..721ed9b 100644 --- a/meson.changes +++ b/meson.changes @@ -3,8 +3,8 @@ Tue Jun 6 13:08:19 UTC 2017 - dimstar@opensuse.org - Make the build footprint smaller to enter ring1: This means we skip a couple tests though. Removed BuildRequires: java-devel, - mono-core, mono-devel, wxWidgets-devel, pkgconfig(protobuf) and - pkgconfig(gtk+-3.0). + libqt5-qtbase-devel, mono-core, mono-devel, wxWidgets-devel, + pkgconfig(protobuf) and pkgconfig(gtk+-3.0). ------------------------------------------------------------------- Wed May 17 20:26:25 UTC 2017 - dimstar@opensuse.org diff --git a/meson.spec b/meson.spec index 1cf9e85..7f81f14 100644 --- a/meson.spec +++ b/meson.spec @@ -46,7 +46,6 @@ BuildRequires: gettext BuildRequires: git BuildRequires: gtk-doc BuildRequires: itstool -BuildRequires: libqt5-qtbase-devel BuildRequires: ninja BuildRequires: pkgconfig BuildRequires: python3 >= 3.4 @@ -83,6 +82,7 @@ Domain Specific Language. # also this build system, we will see issues in GNOME soon enough too rm -rf "test cases/frameworks/2 gtest" \ "test cases/frameworks/3 gmock/" \ + "test cases/frameworks/4 qt" \ "test cases/objc/2 nsstring" \ "test cases/vala/14 target glib version and gresources"