3
0
Fork 0
forked from mirrors/nixpkgs

gnome3.nemiver: use fetchpatch

This commit is contained in:
Jan Tojnar 2018-07-20 15:55:28 +02:00
parent 362c2f67f9
commit 59eb91d757
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
3 changed files with 9 additions and 25 deletions

View file

@ -1,13 +0,0 @@
--- a/src/dbgengine/nmv-dbg-common.h 2014-07-09 10:36:05.000000000 +0200
+++ b/src/dbgengine/nmv-dbg-common.h 2016-08-04 22:40:28.447842746 +0200
@@ -171,7 +171,9 @@
bool has_slot () const
{
- return m_slot;
+ //return m_slot;
+ // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822502
+ return static_cast<bool> (m_slot);
}
template<class T>

View file

@ -20,8 +20,15 @@ stdenv.mkDerivation rec {
];
patches = [
./bool_slot.patch
./safe_ptr.patch
# build fixes
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/nemiver/commit/e0e42221ceb77d88be64fac1c09792dc5c9e2f43.patch;
sha256 = "1g0ixll6yqfj6ysf50p0c7nmh3lgmb6ds15703q7ibnw7dyidvj8";
})
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/nemiver/commit/7005393a8c4d914eac9705e7f47818d0f4de3578.patch;
sha256 = "1mxb1sdqdj7dm204gja8cdygx8579bjriqqbb7cna9rj0m9c8pjg";
})
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch;
sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7";

View file

@ -1,10 +0,0 @@
--- a/src/confmgr/nmv-gconf-mgr.cc 2014-07-08 10:24:06.000000000 +0200
+++ b/src/confmgr/nmv-gconf-mgr.cc 2016-08-04 23:50:08.143060464 +0200
@@ -32,6 +32,7 @@
NEMIVER_BEGIN_NAMESPACE (nemiver)
using nemiver::common::GCharSafePtr;
+using nemiver::common::GErrorSafePtr;
class GConfMgr : public IConfMgr {
GConfMgr (const GConfMgr &);