unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / Atom feed
* [bug#43360] [PATCH 0/2] Add gtranslator
@ 2020-09-12 18:33 Leo Prikler
  2020-09-12 18:35 ` [bug#43360] [PATCH 1/2] gnu: Add libgda Leo Prikler
  0 siblings, 1 reply; 6+ messages in thread
From: Leo Prikler @ 2020-09-12 18:33 UTC (permalink / raw)
  To: 43360

Hi Guix,

this is a small patch series, that first adds libgda and then
gtranslator (aka. GNOME Translation Editor).  The current version of
3.36.0 seems to work, but the debug output it prints is not for the
faint of heart.  I hope, this somehow gets better post wip-desktop
merge.

Regards, 
Leo





^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#43360] [PATCH 1/2] gnu: Add libgda.
  2020-09-12 18:33 [bug#43360] [PATCH 0/2] Add gtranslator Leo Prikler
@ 2020-09-12 18:35 ` Leo Prikler
  2020-09-12 18:35   ` [bug#43360] [PATCH 2/2] gnu: Add gtranslator Leo Prikler
  2020-09-15 12:30   ` [bug#43360] [PATCH 1/2] gnu: Add libgda Ludovic Courtès
  0 siblings, 2 replies; 6+ messages in thread
From: Leo Prikler @ 2020-09-12 18:35 UTC (permalink / raw)
  To: 43360

* gnu/packages/gnome.scm (libgda): New variable.
---
 gnu/packages/gnome.scm | 66 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ed2915e05a..01279aa882 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11445,3 +11445,69 @@ integrated profiler via Sysprof, debugging support, and more.")
     (description "Komikku is an online/offline manga reader for GNOME,
 developed with the aim of being used with the Librem 5 phone.")
     (license license:gpl3+)))
+
+(define-public libgda
+  (package
+    (name "libgda")
+    (version "5.2.9")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/GNOME/libgda.git/")
+             (commit "LIBGDA_5_2_9")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "122anbk15vj2dfxrw7s48b6zwlpp7cyppshxizynvf3zmc0ygw3j"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'remove-broken-tests
+           (lambda _
+             (substitute* "tests/multi-threading/Makefile.am"
+               ((,(string-join
+                   '("mutex" "parser" "cnc_lock" "threaded_cnc" "wrapper")
+                   " check_"
+                   'prefix))
+                (string-join
+                 '("mutex" "parser" "wrapper")
+                 " check_"
+                 'prefix)))
+             #t))
+         (add-before 'check 'pre-check
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Tests require a running X server.
+             (system "Xvfb :1 &")
+             (setenv "DISPLAY" ":1")
+             #t)))))
+    (propagated-inputs
+     `(("libxml2" ,libxml2)))           ; required by libgda-5.0.pc
+    (inputs
+     `(("glib" ,glib)
+       ("gtk+" ,gtk+)
+       ("libxslt" ,libxslt)
+       ("openssl" ,openssl)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("glib:bin" ,glib "bin")
+       ("gnome-common" ,gnome-common)
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
+       ("intltool" ,intltool)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)
+       ("which" ,which)
+       ("xorg-server" ,xorg-server-for-tests)
+       ("yelp-tools" ,yelp-tools)))
+    (home-page "https://gitlab.gnome.org/GNOME/libgda")
+    (synopsis "Uniform data access")
+    (description
+     "GNU Data Access (GDA) is an attempt to provide uniform access to
+different kinds of data sources (databases, information servers, mail spools,
+etc).  It is a complete architecture that provides all you need to access
+your data.")
+    (license license:lgpl2.1+)))
-- 
2.28.0





^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#43360] [PATCH 2/2] gnu: Add gtranslator.
  2020-09-12 18:35 ` [bug#43360] [PATCH 1/2] gnu: Add libgda Leo Prikler
@ 2020-09-12 18:35   ` Leo Prikler
  2020-09-15 12:30   ` [bug#43360] [PATCH 1/2] gnu: Add libgda Ludovic Courtès
  1 sibling, 0 replies; 6+ messages in thread
From: Leo Prikler @ 2020-09-12 18:35 UTC (permalink / raw)
  To: 43360

* gnu/packages/gnome.scm (gtranslator): New variable.
---
 gnu/packages/gnome.scm | 48 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 01279aa882..5d3e6ac6a3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11511,3 +11511,51 @@ different kinds of data sources (databases, information servers, mail spools,
 etc).  It is a complete architecture that provides all you need to access
 your data.")
     (license license:lgpl2.1+)))
+
+(define-public gtranslator
+  (package
+    (name "gtranslator")
+    (version "3.36.0")
+        (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/" name "/"
+                                  (version-major+minor version) "/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1lxd2nkji4jk8g2xmyc1a1r3ww710ddk91zh9psmx8xlb4xivaid"))))
+    (build-system meson-build-system)
+    (inputs
+     `(("json-glib" ,json-glib)
+       ("jsonrpc-glib" ,jsonrpc-glib)
+       ("gettext" ,gettext-minimal)
+       ("glib" ,glib)
+       ("gtk+" ,gtk+)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+       ("gspell" ,gspell)
+       ("libdazzle" ,libdazzle)
+       ("libgda" ,libgda)
+       ("libsoup" ,libsoup)))
+    (native-inputs
+     `(("glib:bin" ,glib "bin")
+       ("itstool" ,itstool)
+       ("pkg-config" ,pkg-config)))
+    (propagated-inputs
+     `(("gtksourceview" ,gtksourceview))) ; required for source view
+    (arguments
+     `(#:build-type "release"
+       #:phases
+       (modify-phases %standard-phases
+       (add-after 'unpack 'skip-gtk-update-icon-cache
+           (lambda _
+             (substitute* "build-aux/meson/meson_post_install.py"
+               (("gtk-update-icon-cache") (which "true")))
+             #t)))))
+    (home-page "https://wiki.gnome.org/Apps/Gtranslator")
+    (synopsis "Translation making program")
+    (description
+     "gtranslator is a quite comfortable gettext po/po.gz/(g)mo files editor
+for the GNOME 3.x platform with many features.  It aims to be a very complete
+editing environment for translation issues within the GNU gettext/GNOME desktop
+world.")
+    (license license:gpl3+)))
-- 
2.28.0





^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#43360] [PATCH 1/2] gnu: Add libgda.
  2020-09-12 18:35 ` [bug#43360] [PATCH 1/2] gnu: Add libgda Leo Prikler
  2020-09-12 18:35   ` [bug#43360] [PATCH 2/2] gnu: Add gtranslator Leo Prikler
@ 2020-09-15 12:30   ` Ludovic Courtès
  2020-09-15 14:08     ` Leo Prikler
  1 sibling, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2020-09-15 12:30 UTC (permalink / raw)
  To: Leo Prikler; +Cc: 43360

Hi!

Leo Prikler <leo.prikler@student.tugraz.at> skribis:

> * gnu/packages/gnome.scm (libgda): New variable.

[...]

> +         (add-after 'unpack 'remove-broken-tests
> +           (lambda _
> +             (substitute* "tests/multi-threading/Makefile.am"
> +               ((,(string-join
> +                   '("mutex" "parser" "cnc_lock" "threaded_cnc" "wrapper")
> +                   " check_"
> +                   'prefix))

Please use a literal string for the regexp.

It’d also be nice to add a short comment explaining what’s wrong with
those tests.

The rest LGTM, thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#43360] [PATCH 1/2] gnu: Add libgda.
  2020-09-15 12:30   ` [bug#43360] [PATCH 1/2] gnu: Add libgda Ludovic Courtès
@ 2020-09-15 14:08     ` Leo Prikler
  2020-09-15 18:53       ` bug#43360: " Ludovic Courtès
  0 siblings, 1 reply; 6+ messages in thread
From: Leo Prikler @ 2020-09-15 14:08 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 43360

[-- Attachment #1: Type: text/plain, Size: 513 bytes --]

Hi!
Am Dienstag, den 15.09.2020, 14:30 +0200 schrieb Ludovic Courtès:
> [...]
> 
> It’d also be nice to add a short comment explaining what’s wrong with
> those tests.
It turned out to be a race condition sparked by those two files trying
to access the same SQL database, which is bound to fail with parallel
tests.  Kinda weird for a "multi-threading" test suite, but whatever.

While I was at it, I also enabled vala and glade support, so this patch
is a little bigger than the previous one.

Regards, Leo

[-- Attachment #2: 0001-gnu-Add-libgda.patch --]
[-- Type: text/x-patch, Size: 3772 bytes --]

From c9b0c5838131e10708ac63b981fea5a8c9d92f62 Mon Sep 17 00:00:00 2001
From: Leo Prikler <leo.prikler@student.tugraz.at>
Date: Sat, 12 Sep 2020 19:51:59 +0200
Subject: [PATCH 1/2] gnu: Add libgda.

* gnu/packages/gnome.scm (libgda): New variable.
---
 gnu/packages/gnome.scm | 79 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ed2915e05a..c8caf5277d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11445,3 +11445,82 @@ integrated profiler via Sysprof, debugging support, and more.")
     (description "Komikku is an online/offline manga reader for GNOME,
 developed with the aim of being used with the Librem 5 phone.")
     (license license:gpl3+)))
+
+(define-public libgda
+  (package
+    (name "libgda")
+    (version "5.2.9")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/GNOME/libgda.git/")
+             (commit "LIBGDA_5_2_9")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "122anbk15vj2dfxrw7s48b6zwlpp7cyppshxizynvf3zmc0ygw3j"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--enable-vala")
+       ;; There's a race between check_cnc_lock and check_threaded_cnc
+       ;; in tests/multi-threading.
+       #:parallel-tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-glade-install
+           (lambda _
+             (substitute* "configure.ac"
+               (("`\\$PKG_CONFIG --variable=catalogdir gladeui-2\\.0`")
+                "${datadir}/glade/catalogs")
+               (("`\\$PKG_CONFIG --variable=pixmapdir gladeui-2\\.0`")
+                "${datadir}/glade/pixmaps"))
+             #t))
+         (add-before 'check 'pre-check
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Tests require a running X server.
+             (system "Xvfb :1 &")
+             (setenv "DISPLAY" ":1")
+             #t))
+         (add-after 'install 'symlink-glade-module
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((shlib "libgda-ui-5.0.so")
+                    (out (assoc-ref outputs "out"))
+                    (out/lib (string-append out "/lib"))
+                    (moduledir (string-append out/lib "/glade/modules")))
+               (mkdir-p moduledir)
+               (symlink (string-append out/lib "/" shlib)
+                        (string-append moduledir "/" shlib))
+               #t))))))
+    (propagated-inputs
+     `(("libxml2" ,libxml2)))           ; required by libgda-5.0.pc
+    (inputs
+     `(("glib" ,glib)
+       ("glade" ,glade3)
+       ("gtk+" ,gtk+)
+       ("libsecret" ,libsecret)
+       ("libxslt" ,libxslt)
+       ("openssl" ,openssl)
+       ("vala" ,vala)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("glib:bin" ,glib "bin")
+       ("gnome-common" ,gnome-common)
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
+       ("intltool" ,intltool)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala)
+       ("which" ,which)
+       ("xorg-server" ,xorg-server-for-tests)
+       ("yelp-tools" ,yelp-tools)))
+    (home-page "https://gitlab.gnome.org/GNOME/libgda")
+    (synopsis "Uniform data access")
+    (description
+     "GNU Data Access (GDA) is an attempt to provide uniform access to
+different kinds of data sources (databases, information servers, mail spools,
+etc).  It is a complete architecture that provides all you need to access
+your data.")
+    (license license:lgpl2.1+)))
-- 
2.28.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

* bug#43360: [PATCH 1/2] gnu: Add libgda.
  2020-09-15 14:08     ` Leo Prikler
@ 2020-09-15 18:53       ` Ludovic Courtès
  0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2020-09-15 18:53 UTC (permalink / raw)
  To: Leo Prikler; +Cc: 43360-done

Hi,

Leo Prikler <leo.prikler@student.tugraz.at> skribis:

> Am Dienstag, den 15.09.2020, 14:30 +0200 schrieb Ludovic Courts:
>> [...]
>> 
>> Itd also be nice to add a short comment explaining whats wrong with
>> those tests.
> It turned out to be a race condition sparked by those two files trying
> to access the same SQL database, which is bound to fail with parallel
> tests.  Kinda weird for a "multi-threading" test suite, but whatever.
>
> While I was at it, I also enabled vala and glade support, so this patch
> is a little bigger than the previous one.
>
> Regards, Leo
>
> From c9b0c5838131e10708ac63b981fea5a8c9d92f62 Mon Sep 17 00:00:00 2001
> From: Leo Prikler <leo.prikler@student.tugraz.at>
> Date: Sat, 12 Sep 2020 19:51:59 +0200
> Subject: [PATCH 1/2] gnu: Add libgda.
>
> * gnu/packages/gnome.scm (libgda): New variable.

Great.  Pushed along with the gtranslator patch, thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-09-15 18:58 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-12 18:33 [bug#43360] [PATCH 0/2] Add gtranslator Leo Prikler
2020-09-12 18:35 ` [bug#43360] [PATCH 1/2] gnu: Add libgda Leo Prikler
2020-09-12 18:35   ` [bug#43360] [PATCH 2/2] gnu: Add gtranslator Leo Prikler
2020-09-15 12:30   ` [bug#43360] [PATCH 1/2] gnu: Add libgda Ludovic Courtès
2020-09-15 14:08     ` Leo Prikler
2020-09-15 18:53       ` bug#43360: " Ludovic Courtès

unofficial mirror of guix-patches@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix-patches/1 guix-patches/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 guix-patches guix-patches/ https://yhetil.org/guix-patches \
		guix-patches@gnu.org
	public-inbox-index guix-patches

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://news.yhetil.org/yhetil.gnu.guix.patches


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git