gigedit: svn-2342 -> 1.1.0
This commit is contained in:
parent
9b1ba6515a
commit
56ca5cb13d
@ -1,25 +1,25 @@
|
||||
{ stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45
|
||||
, docbook_xsl, gtkmm2, intltool, libgig, libsndfile, libtool, libxslt
|
||||
, pkgconfig }:
|
||||
{ stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, which
|
||||
, docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gigedit-svn-${version}";
|
||||
version = "2342";
|
||||
name = "gigedit-${version}";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "https://svn.linuxsampler.org/svn/gigedit/trunk";
|
||||
rev = "${version}";
|
||||
sha256 = "0wi94gymj0ns5ck9lq1d970gb4gnzrq4b57j5j7k3d6185yg2gjs";
|
||||
src = fetchurl {
|
||||
url = "http://download.linuxsampler.org/packages/${name}.tar.bz2";
|
||||
sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
|
||||
};
|
||||
|
||||
patchPhase = "sed -e 's/which/type -P/g' -i Makefile.cvs";
|
||||
patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ];
|
||||
|
||||
preConfigure = "make -f Makefile.cvs";
|
||||
preConfigure = "make -f Makefile.svn";
|
||||
|
||||
buildInputs = [
|
||||
autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm2 intltool
|
||||
libgig libsndfile libtool libxslt pkgconfig
|
||||
];
|
||||
nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ];
|
||||
|
||||
buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.linuxsampler.org;
|
||||
|
@ -0,0 +1,15 @@
|
||||
--- a/src/gigedit/wrapLabel.cc
|
||||
+++ b/src/gigedit/wrapLabel.cc
|
||||
@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text
|
||||
: mWrapWidth(0),
|
||||
mWrapHeight(0)
|
||||
{
|
||||
- // pangomm >= 2.35.1
|
||||
-#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1)))
|
||||
- get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR);
|
||||
-#else
|
||||
get_layout()->set_wrap(Pango::WRAP_WORD_CHAR);
|
||||
-#endif
|
||||
set_alignment(0.0, 0.0);
|
||||
set_text(text);
|
||||
}
|
Loading…
Reference in New Issue
Block a user