diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-07-26 18:15:13 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-07-26 18:15:13 +0200 |
| commit | ac46a1c8e465df81d661632a273d07443aefa24e (patch) | |
| tree | e969b5f54a1d0607dd867a646e557dc1579763e6 /gnu/local.mk | |
| parent | 3b92441bc16f335b0a8fb2b3f6c660ec7e16df4f (diff) | |
| parent | 92526ade57e0bd23ab4025b8532511ef80df5fba (diff) | |
| download | gnu-guix-ac46a1c8e465df81d661632a273d07443aefa24e.tar gnu-guix-ac46a1c8e465df81d661632a273d07443aefa24e.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 651aafb97e..e2bdd4742d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1046,6 +1046,7 @@ dist_patch_DATA = \ %D%/packages/patches/pybugz-stty.patch \ %D%/packages/patches/pygpgme-disable-problematic-tests.patch \ %D%/packages/patches/pyqt-configure.patch \ + %D%/packages/patches/pyqt-public-sip.patch \ %D%/packages/patches/python-2-deterministic-build-info.patch \ %D%/packages/patches/python-2.7-adjust-tests.patch \ %D%/packages/patches/python-2.7-search-paths.patch \ @@ -1089,7 +1090,6 @@ dist_patch_DATA = \ %D%/packages/patches/qtoctave-qt-5.11-fix.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ - %D%/packages/patches/quassel-qt-5.11.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/rapicorn-isnan.patch \ %D%/packages/patches/raptor2-heap-overflow.patch \ @@ -1133,7 +1133,6 @@ dist_patch_DATA = \ %D%/packages/patches/superlu-dist-scotchmetis.patch \ %D%/packages/patches/swish-e-search.patch \ %D%/packages/patches/swish-e-format-security.patch \ - %D%/packages/patches/syncthing-fix-crash.patch \ %D%/packages/patches/synfigstudio-fix-ui-with-gtk3.patch \ %D%/packages/patches/t1lib-CVE-2010-2642.patch \ %D%/packages/patches/t1lib-CVE-2011-0764.patch \ |