alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

artha: 1.0.3 -> 1.0.5

Browse source 
Among other things fixes build against -fno-common toolchains
like clang-12:

    $ nix build --impure --expr 'with import ./.{}; artha.override { stdenv = clang12Stdenv; }' -L
    ...
    artha> ld: gui.o:/build/artha-1.0.3/src/./mod_notify.h:37:
      multiple definition of `notify_uninit';
        mod_notify.o:/build/artha-1.0.3/src/./mod_notify.h:37: first defined here
This commit is contained in:
Sergei Trofimovich 2022-01-16 17:09:54 +00:00
parent d0a7fc845d
commit 641a7dedef
2 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/misc/artha/default.nix
View file

@ -1,21 +1,17 @@
{ lib, stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkg-config, wordnet }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "artha";
version = "1.0.3";
version = "1.0.5";
src = fetchurl {
url = "mirror://sourceforge/artha/1.0.3/artha-1.0.3.tar.bz2";
sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx";
url = "mirror://sourceforge/artha/${version}/artha-${version}.tar.bz2";
sha256 = "034r7vfk5y7705k068cdlq52ikp6ip10w6047a5zjdakbn55c3as";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ dbus-glib gtk2 wordnet ];
patches = [
./gio-underlink.patch
];
meta = with lib; {
description = "An offline thesaurus based on WordNet";
homepage = "http://artha.sourceforge.net";

13
pkgs/applications/misc/artha/gio-underlink.patch
View file

@ -1,13 +0,0 @@
diff --git a/src/Makefile.am b/src/Makefile.am
index 0236d72..bcc1182 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,7 +38,7 @@ artha_LDADD = libwni.a $(WORDNET_LIB)
if POSIX
AM_CFLAGS += @libdbus_CFLAGS@
-artha_LDADD += -lX11 -ldbus-1 -ldbus-glib-1 -lgtk-x11-2.0 \
+artha_LDADD += -lX11 -ldbus-1 -ldbus-glib-1 -lgio-2.0 -lgtk-x11-2.0 \
-lgdk-x11-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0
else
artha_LDADD += @GTK_LIBS@