dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #68934 from mimame/update/gigedit-1.1.1

Browse Source 
gigedit: 1.1.0 -> 1.1.1
This commit is contained in:
Sarah Brofeldt 2019-09-23 07:53:47 +02:00 committed by GitHub
commit 57649e8d63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/audio/gigedit/default.nix
View File

@ -4,15 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gigedit"; pname = "gigedit";
version = "1.1.0"; version = "1.1.1";
src = fetchurl { src = fetchurl {
url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni"; sha256 = "08db12crwf0dy1dbyrmivqqpg5zicjikqkmf2kb1ywpq0a9hcxrb";
}; };
patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ];
preConfigure = "make -f Makefile.svn"; preConfigure = "make -f Makefile.svn";
nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ]; nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ];

15
pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
View File

@ -1,15 +0,0 @@
--- 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);
}