gigedit: svn-2342 -> 1.1.0

+30 -15
+15 -15
pkgs/applications/audio/gigedit/default.nix
··· 1 - { stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45 2 - , docbook_xsl, gtkmm2, intltool, libgig, libsndfile, libtool, libxslt 3 - , pkgconfig }: 4 5 stdenv.mkDerivation rec { 6 - name = "gigedit-svn-${version}"; 7 - version = "2342"; 8 9 - src = fetchsvn { 10 - url = "https://svn.linuxsampler.org/svn/gigedit/trunk"; 11 - rev = "${version}"; 12 - sha256 = "0wi94gymj0ns5ck9lq1d970gb4gnzrq4b57j5j7k3d6185yg2gjs"; 13 }; 14 15 - patchPhase = "sed -e 's/which/type -P/g' -i Makefile.cvs"; 16 17 - preConfigure = "make -f Makefile.cvs"; 18 19 - buildInputs = [ 20 - autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm2 intltool 21 - libgig libsndfile libtool libxslt pkgconfig 22 - ]; 23 24 meta = with stdenv.lib; { 25 homepage = http://www.linuxsampler.org;
··· 1 + { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, which 2 + , docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt 3 + }: 4 5 stdenv.mkDerivation rec { 6 + name = "gigedit-${version}"; 7 + version = "1.1.0"; 8 9 + src = fetchurl { 10 + url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; 11 + sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni"; 12 }; 13 14 + patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ]; 15 + 16 + preConfigure = "make -f Makefile.svn"; 17 + 18 + nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ]; 19 20 + buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ]; 21 22 + enableParallelBuilding = true; 23 24 meta = with stdenv.lib; { 25 homepage = http://www.linuxsampler.org;
+15
pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
···
··· 1 + --- a/src/gigedit/wrapLabel.cc 2 + +++ b/src/gigedit/wrapLabel.cc 3 + @@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text 4 + : mWrapWidth(0), 5 + mWrapHeight(0) 6 + { 7 + - // pangomm >= 2.35.1 8 + -#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1))) 9 + - get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR); 10 + -#else 11 + get_layout()->set_wrap(Pango::WRAP_WORD_CHAR); 12 + -#endif 13 + set_alignment(0.0, 0.0); 14 + set_text(text); 15 + }