From 711670c04faec02f1c4cccf78a66c90bc7cdfa6e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 Aug 2016 22:59:16 +0200 Subject: gnu: gtk+-2: Add patch to support GUIX_GTK2_IM_MODULE_FILE. * gnu/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch: New file. * gnu/packages/gtk.scm (gtk+-2)[source]: Add it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/packages/gtk.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8feac11d98..e1d9cf9d6d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -563,6 +563,7 @@ is part of the GNOME accessibility project.") (base32 "0l6aqk86aw5w132ygy6hv6nlxvd1h6xg7c85qbm60p6mnv1ww58d")) (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch" + "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch" "gtk2-theme-paths.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) -- cgit 1.4.1 From 234e7980b54ef37e9a24440ec7219c81d6288a71 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 Aug 2016 23:01:11 +0200 Subject: gnu: gtk+: Add patch to support GUIX_GTK3_IM_MODULE_FILE. * gnu/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch: New file. * gnu/packages/gtk.scm (gtk+)[source]: Add it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/gtk.scm | 3 ++- .../patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/local.mk b/gnu/local.mk index a67b00ccdf..a41ade7c4f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -553,6 +553,7 @@ dist_patch_DATA = \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \ %D%/packages/patches/gtk2-theme-paths.patch \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \ + %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ %D%/packages/patches/hdf5-config-date.patch \ %D%/packages/patches/higan-remove-march-native-flag.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e1d9cf9d6d..396ff1f1d0 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -625,7 +625,8 @@ application suites.") (sha256 (base32 "157nh9gg0p2avw765hrnkvr8lsh2w811397yxgjv6q5j4fzz6d1q")) - (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch")))) + (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" + "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (propagated-inputs `(("at-spi2-atk" ,at-spi2-atk) ("atk" ,atk) diff --git a/gnu/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch b/gnu/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch new file mode 100644 index 0000000000..aa63a54402 --- /dev/null +++ b/gnu/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch @@ -0,0 +1,15 @@ +This patch replaces the environment variable "GTK_IM_MODULE" with +"GUIX_GTK3_IM_MODULE_FILE" to prevent this version of GTK+ from loading input +method modules for other major versions of GTK+. + +--- gtk+-3.20.3/gtk/deprecated/gtkrc.c 2016-08-21 22:40:48.168437905 +0200 ++++ gtk+-3.20.3/gtk/deprecated/gtkrc.c 2016-08-23 10:12:09.097070097 +0200 +@@ -768,7 +768,7 @@ + gchar * + gtk_rc_get_im_module_file (void) + { +- const gchar *var = g_getenv ("GTK_IM_MODULE_FILE"); ++ const gchar *var = g_getenv ("GUIX_GTK3_IM_MODULE_FILE"); + gchar *result = NULL; + + if (var) -- cgit 1.4.1 From 37355498e677fbb5f736e825b7e8f5055e7496b4 Mon Sep 17 00:00:00 2001 From: doncatnip Date: Thu, 1 Sep 2016 03:15:01 +0200 Subject: gnu: gtk: Add clipit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gtk.scm (clipit): New variable. Co-authored-by: 宋文武 --- gnu/packages/gtk.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 396ff1f1d0..74c4ed36a9 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1333,3 +1333,29 @@ glass artworks done by Venicians glass blowers.") "GtkSpell provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget.") (license license:gpl2+))) + +(define-public clipit + (package + (name "clipit") + (version "1.4.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/downloads/ClipIt/clipit-" + version ".tar.gz")) + (sha256 + (base32 + "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva")))) + (build-system gnu-build-system) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("gtk+" ,gtk+-2))) + (home-page "https://github.com/CristianHenzel/ClipIt") + (synopsis "Lightweight GTK+ clipboard manager") + (description + "ClipIt is a clipboard manager with features such as a history, search +thereof, global hotkeys and clipboard item actions. It was forked from +Parcellite and adds bugfixes and features.") + (license license:gpl2+))) -- cgit 1.4.1 From 40b3f52399feeca34e20796c22776f6c462e42c0 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 4 Sep 2016 15:20:24 +0200 Subject: gnu: Add cairo-xcb. * gnu/packages/gtk.scm (cairo-xcb): New variable. --- gnu/packages/gtk.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 74c4ed36a9..5f55c1ee6f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -149,6 +149,19 @@ affine transformation (scale, rotation, shear, etc.).") (license license:lgpl2.1) ; or Mozilla Public License 1.1 (home-page "http://cairographics.org/"))) +(define-public cairo-xcb + (package + (inherit cairo) + (name "cairo-xcb") + (inputs + `(("mesa" ,mesa) + ,@(package-inputs cairo))) + (arguments + `(#:tests? #f + #:configure-flags + '("--enable-xlib-xcb" "--enable-gl" "--enable-egl"))) + (synopsis "2D graphics library (with X11 support)"))) + (define-public harfbuzz (package (name "harfbuzz") -- cgit 1.4.1 From e4360e16f932d0554ac9b1fe01b5c383bb0392ce Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 18 Sep 2016 10:15:39 +0200 Subject: gnu: gtk+ use modify-phases * gnu/packages/gtk.scm (arguments): Replace alist-cons-before with modify-phases --- gnu/packages/gtk.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5f55c1ee6f..df79239951 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -673,20 +673,18 @@ application suites.") #:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") "/share/gtk-doc/html")) - #:phases - (alist-cons-before - 'configure 'pre-configure - (lambda _ - ;; Disable most tests, failing in the chroot with the message: - ;; D-Bus library appears to be incorrectly set up; failed to read - ;; machine uuid: Failed to open "/etc/machine-id": No such file or - ;; directory. - ;; See the manual page for dbus-uuidgen to correct this issue. - (substitute* "testsuite/Makefile.in" - (("SUBDIRS = gdk gtk a11y css reftests") - "SUBDIRS = gdk")) - #t) - %standard-phases))) + #:phases (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda _ + ;; Disable most tests, failing in the chroot with the message: + ;; D-Bus library appears to be incorrectly set up; failed to read + ;; machine uuid: Failed to open "/etc/machine-id": No such file or + ;; directory. + ;; See the manual page for dbus-uuidgen to correct this issue. + (substitute* "testsuite/Makefile.in" + (("SUBDIRS = gdk gtk a11y css reftests") + "SUBDIRS = gdk")) + #t))))) (native-search-paths (list (search-path-specification (variable "GUIX_GTK3_PATH") -- cgit 1.4.1