summary refs log tree commit diff
diff options
context:
space:
mode:
authorMiguel Madrid Mencía <miguel.madrid.mencia@gmail.com>2019-09-16 21:04:25 +0200
committerMiguel Madrid Mencía <miguel.madrid.mencia@gmail.com>2019-09-16 21:04:25 +0200
commit3ffd7ba6d039e5764349b680d9a5996924a62a67 (patch)
tree55e3cf29c9a018cdea3bdea3f00854430c66b9c7
parent956669e8948fe3624e7fca527a9116e13d6466f4 (diff)
downloadnixpkgs-3ffd7ba6d039e5764349b680d9a5996924a62a67.tar
nixpkgs-3ffd7ba6d039e5764349b680d9a5996924a62a67.tar.gz
nixpkgs-3ffd7ba6d039e5764349b680d9a5996924a62a67.tar.bz2
nixpkgs-3ffd7ba6d039e5764349b680d9a5996924a62a67.tar.lz
nixpkgs-3ffd7ba6d039e5764349b680d9a5996924a62a67.tar.xz
nixpkgs-3ffd7ba6d039e5764349b680d9a5996924a62a67.tar.zst
nixpkgs-3ffd7ba6d039e5764349b680d9a5996924a62a67.zip
gigedit: 1.1.0 -> 1.1.1
-rw-r--r--pkgs/applications/audio/gigedit/default.nix6
-rw-r--r--pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch15
2 files changed, 2 insertions, 19 deletions
diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix
index d8fada45eb1..b8ec2d7116f 100644
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -4,15 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gigedit";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchurl {
     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";
 
   nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ];
diff --git a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
deleted file mode 100644
index eb00fcc87a2..00000000000
--- a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
+++ /dev/null
@@ -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);
- }