[csw-users] Updated Easytag 2.1.8 recipe

[Laurent Blume]

Maciej,

Here is a patch to the recipe to build Easytag 2.1.8. En the end, it 
works with Studio 12.3, and the namespace issue somehow disappeared 
after I did an «mgar up --all» (which I hadn't done in a while, sorry).

It's mostly adding build-time dependencies & GNU gettext (the 
./configure is much more picky), and a define to work around a Pango issue.

Laurent
-------------- next part --------------
--- Makefile.original	Sat Apr  6 19:26:16 2013
+++ Makefile	Sat Apr  6 20:18:03 2013
@@ -1,5 +1,5 @@
 NAME = easytag
-VERSION = 2.1.7
+VERSION = 2.1.8
 GARTYPE = v2
 
 DESCRIPTION = Tag editor for MP3, Ogg Vorbis files and more
@@ -9,8 +9,8 @@
   interface makes tagging easier under GNU/Linux or Windows.
 endef
 
-MASTER_SITES = $(SF_MIRRORS)
-DISTFILES += $(NAME)-$(VERSION).tar.bz2
+MASTER_SITES = http://download.gnome.org/sources/easytag/2.1/
+DISTFILES  = $(NAME)-$(VERSION).tar.xz
 
 BUILD_DEP_PKGS += CSWlibogg-dev
 BUILD_DEP_PKGS += CSWlibvorbis-dev
@@ -17,6 +17,22 @@
 BUILD_DEP_PKGS += CSWlibflac-dev
 BUILD_DEP_PKGS += CSWlibspeex-dev
 BUILD_DEP_PKGS += CSWlibwavpack-dev
+BUILD_DEP_PKGS += CSWintltool
+BUILD_DEP_PKGS += CSWpkgconfig
+BUILD_DEP_PKGS += CSWlibgtk2-dev
+BUILD_DEP_PKGS += CSWlibpcre-dev
+BUILD_DEP_PKGS += CSWfconfig-dev
+BUILD_DEP_PKGS += CSWlibfreetype-dev
+BUILD_DEP_PKGS += CSWlibpng-dev
+BUILD_DEP_PKGS += CSWx11xproto
+BUILD_DEP_PKGS += CSWx11renderproto
+BUILD_DEP_PKGS += CSWlibx11devel
+BUILD_DEP_PKGS += CSWlibxcbdevel
+BUILD_DEP_PKGS += CSWlibxaudevel
+BUILD_DEP_PKGS += CSWlibxdmcpdevel
+BUILD_DEP_PKGS += CSWlibid3-dev
+BUILD_DEP_PKGS += CSWlibiconv-dev
+BUILD_DEP_PKGS += CSWggettext-dev
 
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgdk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgdk-pixbuf2-0-0
@@ -34,10 +50,21 @@
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibspeex1
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibvorbisfile3
 
-# Needed for gethostbyname
-EXTRA_LINKER_FLAGS = -lnsl
 
-EXTRA_CONFIGURE_EXPORTS += LIBS
-CONFIGURE_ENV_LIBS = -lCrun
-
 include gar/category.mk
+
+# Needed in 2.1.8
+MSGFMT   = /opt/csw/bin/gmsgfmt
+MSGMERGE = /opt/csw/bin/gmsgmerge
+XGETTEXT = /opt/csw/bin/gxgettext
+GETTEXT  = /opt/csw/bin/ggettext
+PKG_CONFIG      = /opt/csw/bin/pkg-config
+PKG_CONFIG_PATH = /opt/csw/X11/lib/pkgconfig
+EXTRA_CONFIGURE_EXPORTS  = MSGFMT MSGMERGE XGETTEXT GETTEXT
+EXTRA_CONFIGURE_EXPORTS += PKG_CONFIG PKG_CONFIG_PATH
+
+# This macro is being phased out of Pango, so this seems like an acceptable
+# fix for now:
+# https://bugzilla.gnome.org/show_bug.cgi?id=652202
+CFLAGS = -DG_CONST_RETURN=const
+