diff options
author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2019-09-23 07:53:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-23 07:53:47 +0200 |
commit | 57649e8d635ad11446dc62ba68804d00fa6325cf (patch) | |
tree | dd0f295c2f2bfd5fbb2a1143f33f02ff934f0e55 /pkgs/applications | |
parent | 6262e83f5f96b44c27ffa7082200b6abe439d3ac (diff) | |
parent | 3ffd7ba6d039e5764349b680d9a5996924a62a67 (diff) | |
download | nixlib-57649e8d635ad11446dc62ba68804d00fa6325cf.tar nixlib-57649e8d635ad11446dc62ba68804d00fa6325cf.tar.gz nixlib-57649e8d635ad11446dc62ba68804d00fa6325cf.tar.bz2 nixlib-57649e8d635ad11446dc62ba68804d00fa6325cf.tar.lz nixlib-57649e8d635ad11446dc62ba68804d00fa6325cf.tar.xz nixlib-57649e8d635ad11446dc62ba68804d00fa6325cf.tar.zst nixlib-57649e8d635ad11446dc62ba68804d00fa6325cf.zip |
Merge pull request #68934 from mimame/update/gigedit-1.1.1
gigedit: 1.1.0 -> 1.1.1
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/gigedit/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch | 15 |
2 files changed, 2 insertions, 19 deletions
diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index d8fada45eb16..b8ec2d7116f5 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 eb00fcc87a24..000000000000 --- 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); - } |