From 29c7b4d6389d7d0ae70f2d87f27433431ac74890 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Mar 2018 13:10:07 +0100 Subject: gnu: gtkmm: Update to 3.22.2. * gnu/packages/gtk.scm (gtkmm): Update to 3.22.2. [arguments]: Set #:configure-flags. --- gnu/packages/gtk.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ceb3f4dc4e..3a67e84d2a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1053,7 +1053,7 @@ toolkit.") (define-public gtkmm (package (name "gtkmm") - (version "3.22.0") + (version "3.22.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1061,7 +1061,7 @@ toolkit.") name "-" version ".tar.xz")) (sha256 (base32 - "1x8l0ny6r3ym53z82q9d5fan4m9vi93xy3b3hj1hrclgc95lvnh5")))) + "1400535lhyya462pfx8bp11k3mg3jsbdghlpygskd5ai665dkbwi")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ;for 'glib-compile-resources' @@ -1073,7 +1073,10 @@ toolkit.") ("gtk+" ,gtk+) ("glibmm" ,glibmm))) (arguments - '(#:phases (modify-phases %standard-phases + '(;; XXX: Tests require C++14 or later. Remove this when the default + ;; compiler is >= GCC6. + #:configure-flags '("CXXFLAGS=-std=gnu++14") + #:phases (modify-phases %standard-phases (add-before 'check 'run-xvfb (lambda* (#:key inputs #:allow-other-keys) (let ((xorg-server (assoc-ref inputs "xorg-server"))) -- cgit v1.2.3 From 6a49ae786487013cecd97a372514b75c77282b50 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Mar 2018 13:10:57 +0100 Subject: gnu: gtkmm: Use the for-test xorg variant for tests. * gnu/packages/gtk.scm (gtkmm)[native-inputs]: Replace XORG-SERVER with XORG-SERVER-1.19.3. [arguments]: Add #:disallowed-references. --- gnu/packages/gtk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3a67e84d2a..9fc9fd6015 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1065,7 +1065,7 @@ toolkit.") (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ;for 'glib-compile-resources' - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-1.19.3))) (propagated-inputs `(("pangomm" ,pangomm) ("cairomm" ,cairomm) @@ -1073,9 +1073,10 @@ toolkit.") ("gtk+" ,gtk+) ("glibmm" ,glibmm))) (arguments - '(;; XXX: Tests require C++14 or later. Remove this when the default + `(;; XXX: Tests require C++14 or later. Remove this when the default ;; compiler is >= GCC6. #:configure-flags '("CXXFLAGS=-std=gnu++14") + #:disallowed-references (,xorg-server-1.19.3) #:phases (modify-phases %standard-phases (add-before 'check 'run-xvfb (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From 8e933cb36aa08843fd0187ec4c441179a1ed3695 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Mar 2018 13:15:15 +0100 Subject: gnu: Use HTTPS on gtkmm.org home pages. * gnu/packages/gtk.scm (atkmm, gtkmm)[home-page]: Use HTTPS. * gnu/packages/gnome.scm (libgnomecanvasmm)[home-page]: Likewise. * gnu/packages/glib.scm (glibmm)[home-page]: Likewise. --- gnu/packages/glib.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/gtk.scm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index e09351a788..366d615e58 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -535,7 +535,7 @@ has an ease of use unmatched by other C++ callback libraries.") (propagated-inputs `(("libsigc++" ,libsigc++) ("glib" ,glib))) - (home-page "http://gtkmm.org/") + (home-page "https://gtkmm.org/") (synopsis "C++ interface to the GLib library") (description "Glibmm provides a C++ programming interface to the part of GLib that are diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d6f7e9e281..2384bf2381 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1595,7 +1595,7 @@ creating interactive structured graphics.") (native-inputs `(("gtkmm-2" ,gtkmm-2) ("pkg-config" ,pkg-config))) - (home-page "http://gtkmm.org") + (home-page "https://gtkmm.org") (synopsis "C++ bindings to the GNOME Canvas library") (description "C++ bindings to the GNOME Canvas library.") (license license:lgpl2.0+))) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9fc9fd6015..a1d7e548aa 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1043,7 +1043,7 @@ library.") (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs `(("glibmm" ,glibmm) ("atk" ,atk))) - (home-page "http://www.gtkmm.org") + (home-page "https://www.gtkmm.org") (synopsis "C++ interface to the ATK accessibility library") (description "ATKmm provides a C++ programming interface to the ATK accessibility @@ -1088,7 +1088,7 @@ toolkit.") ;; Don't fail because of the missing /etc/machine-id. (setenv "DBUS_FATAL_WARNINGS" "0") #t)))))) - (home-page "http://gtkmm.org/") + (home-page "https://gtkmm.org/") (synopsis "C++ interface to the GTK+ graphical user interface library") (description -- cgit v1.2.3 From e07a44891cd906aa071e88e355b9cc8f93b047f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Mar 2018 13:27:09 +0100 Subject: gnu: Add gtksourceviewmm. * gnu/packages/gtk.scm (gtksourceviewmm): New public variable. --- gnu/packages/gtk.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a1d7e548aa..a96cb96470 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1122,6 +1122,38 @@ extensive documentation, including API reference and a tutorial.") ("gtk+" ,gtk+-2) ("glibmm" ,glibmm))))) +(define-public gtksourceviewmm + (package + (name "gtksourceviewmm") + (version "3.18.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0fgvmhm4h4qmxig87qvangs6ijw53mi40siz7pixlxbrsgiil22i")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (propagated-inputs + ;; In 'Requires' of gtksourceviewmm-3.0.pc. + `(("glibmm" ,glibmm) + ("gtkmm" ,gtkmm) + ("gtksourceview" ,gtksourceview))) + (synopsis "C++ interface to the GTK+ 'GtkTextView' widget") + (description + "gtksourceviewmm is a portable C++ library that extends the standard GTK+ +framework for multiline text editing with support for configurable syntax +highlighting, unlimited undo/redo, search and replace, a completion framework, +printing and other features typical of a source code editor.") + (license license:lgpl2.1+) + (home-page "https://developer.gnome.org/gtksourceview/"))) + +;;; +;;; Python bindings. +;;; + (define-public python-pycairo (package (name "python-pycairo") -- cgit v1.2.3