#1 Update to 4.3.1 and convert to meson
Merged 5 years ago by pwalter. Opened 5 years ago by kathenas.
Unknown source master  into  master

file modified
+1
@@ -1,2 +1,3 @@

  /gtksourceview-4.0.3.tar.xz

  /gtksourceview-4.2.0.tar.xz

+ /gtksourceview-4.3.1.tar.xz

file modified
+12 -10
@@ -2,16 +2,19 @@

  %global gtk_version 3.20

  

  Name:           gtksourceview4

- Version:        4.2.0

+ Version:        4.3.1

  Release:        1%{?dist}

  Summary:        Source code editing widget

  

  License:        LGPLv2+

  URL:            https://wiki.gnome.org/Projects/GtkSourceView

- Source0:        https://download.gnome.org/sources/gtksourceview/4.2/gtksourceview-%{version}.tar.xz

+ Source0:        https://download.gnome.org/sources/gtksourceview/4.3/gtksourceview-%{version}.tar.xz

  

+ BuildRequires:  gcc

  BuildRequires:  gettext

  BuildRequires:  itstool

+ BuildRequires:  meson

+ BuildRequires:  gtk-doc

  BuildRequires:  pkgconfig(gdk-pixbuf-2.0)

  BuildRequires:  pkgconfig(gladeui-2.0)

  BuildRequires:  pkgconfig(glib-2.0) >= %{glib_version}
@@ -53,16 +56,11 @@

  %autosetup -n gtksourceview-%{version}

  

  %build

- %configure \

-   --disable-gtk-doc \

-   --disable-static \

-   --enable-glade-catalog \

-   --enable-installed-tests

- 

- make %{?_smp_mflags}

+ %meson -Dgtk_doc=true -Dglade_catalog=true -Dinstall_tests=true

+ %meson_build

  

  %install

- %make_install

+ %meson_install

  

  # remove unwanted files

  rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -100,6 +98,10 @@

  %{_datadir}/installed-tests/gtksourceview-4/

  

  %changelog

+ * Mon Apr 29 2019 Phil Wyett <philwyett@kathenas.org> - 4.3.1-1

+ - Update to 4.3.1

+ - Convert to meson

+ 

  * Sat Mar 16 2019 Kalev Lember <klember@redhat.com> - 4.2.0-1

  - Update to 4.2.0

  

file modified
+1 -1
@@ -1,1 +1,1 @@

- SHA512 (gtksourceview-4.2.0.tar.xz) = f2350b1e7042309c01be0feda6059d788a7ef55c4ccd48e16b4c92a71292ed6f92243455ca42aa0950db61de8d68f4a76f4fac46cd46316b690bcef1ea34c641

+ SHA512 (gtksourceview-4.3.1.tar.xz) = 20fad99ca7119e89ababc427b5f2893c8dc0c33b80fd11fcf9c50d4b19c44659bc02069ed70ac41c8724caf80c33b8a78200c1429db94b2baf1ddc10890600d0

1 new commit added

  • Add 'gtk-doc' as BuildRequires
5 years ago

Thanks for the PR! Why do you need the cmake buildrequires?

1 new commit added

  • Remove cmake BuildRequires
5 years ago

Thanks for the PR! Why do you need the cmake buildrequires?

Was done in error. Was working on another project at the time and my mind must have merged processes at some point. Sorry for the error.

Can you squash it all down into one commit and then it LGTM. Thanks.

rebased onto a2d6b1a

5 years ago

Pull-Request has been merged by pwalter

5 years ago