diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-12-27 12:03:04 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-12-27 12:03:04 -0500 |
| commit | f9930cfaabe631e2b90f4ee3d30b149f0e3aaae4 (patch) | |
| tree | 8a901e6acebe892664e52d499c5c596a591dc178 /gnu-system.am | |
| parent | bf7688fe4d8624ed9bddc8f7f3887df5f1fc3957 (diff) | |
| parent | 7f9b77dc465f35a3689036e12d0bf85ed7d81f52 (diff) | |
| download | guix-f9930cfaabe631e2b90f4ee3d30b149f0e3aaae4.tar.gz | |
Merge branch 'xorg-updates'
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/gnu-system.am b/gnu-system.am index c42843af93..fea7447964 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -388,7 +388,7 @@ dist_patch_DATA = \ gnu/packages/patches/icecat-CVE-2014-1592.patch \ gnu/packages/patches/icecat-CVE-2014-1593.patch \ gnu/packages/patches/icecat-CVE-2014-1594.patch \ - gnu/packages/patches/inkscape-stray-comma.patch \ + gnu/packages/patches/irrlicht-mesa-10.patch \ gnu/packages/patches/jbig2dec-ignore-testtest.patch \ gnu/packages/patches/kmod-module-directory.patch \ gnu/packages/patches/libarchive-CVE-2013-0211.patch \ @@ -443,6 +443,7 @@ dist_patch_DATA = \ gnu/packages/patches/ripperx-libm.patch \ gnu/packages/patches/scheme48-tests.patch \ gnu/packages/patches/scotch-test-threading.patch \ + gnu/packages/patches/sdl-libx11-1.6.patch \ gnu/packages/patches/slim-session.patch \ gnu/packages/patches/slim-config.patch \ gnu/packages/patches/slim-sigusr1.patch \ @@ -457,10 +458,27 @@ dist_patch_DATA = \ gnu/packages/patches/udev-gir-libtool.patch \ gnu/packages/patches/util-linux-perl.patch \ gnu/packages/patches/vpnc-script.patch \ + gnu/packages/patches/vtk-mesa-10.patch \ gnu/packages/patches/w3m-fix-compile.patch \ gnu/packages/patches/wmctrl-64-fix.patch \ - gnu/packages/patches/xf86-input-synaptics-glibc-2.20.patch \ - gnu/packages/patches/xf86-video-openchrome-includes.patch \ + gnu/packages/patches/xf86-video-ark-remove-mibstore.patch \ + gnu/packages/patches/xf86-video-ast-remove-mibstore.patch \ + gnu/packages/patches/xf86-video-geode-glibc-2.20.patch \ + gnu/packages/patches/xf86-video-glint-remove-mibstore.patch \ + gnu/packages/patches/xf86-video-i128-remove-mibstore.patch \ + gnu/packages/patches/xf86-video-intel-compat-api.patch \ + gnu/packages/patches/xf86-video-intel-glibc-2.20.patch \ + gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch \ + gnu/packages/patches/xf86-video-mga-glibc-2.20.patch \ + gnu/packages/patches/xf86-video-nv-remove-mibstore.patch \ + gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch \ + gnu/packages/patches/xf86-video-r128-glibc-2.20.patch \ + gnu/packages/patches/xf86-video-siliconmotion-remove-mibstore.patch \ + gnu/packages/patches/xf86-video-sis-update-api.patch \ + gnu/packages/patches/xf86-video-tdfx-remove-mibstore.patch \ + gnu/packages/patches/xf86-video-tga-remove-mibstore.patch \ + gnu/packages/patches/xf86-video-trident-remove-mibstore.patch \ + gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch \ gnu/packages/patches/xfce4-panel-plugins.patch \ gnu/packages/patches/xmodmap-asprintf.patch |