Merge remote-tracking branch 'origin/pr/397'

* origin/pr/397:
  Replace ImageMagick with GraphicsMagick

archlinux/PKGBUILD

@@ -59,7 +59,7 @@ package_qubes-vm-core() {
     }
     release=${BASH_REMATCH[1]}.${BASH_REMATCH[2]}
     depends=(qubes-vm-utils python python-xdg ntp iproute2
-             gnome-packagekit imagemagick fakeroot notification-daemon dconf
+             gnome-packagekit graphicsmagick fakeroot notification-daemon dconf
              zenity qubes-libvchan qubes-db-vm haveged python-gobject
              python-dbus xdg-utils notification-daemon gawk sed procps-ng librsvg
              socat pacman-contrib parted

debian/control

@@ -30,7 +30,7 @@ Depends:
     dconf-cli,
     dmsetup,
     gawk,
-    imagemagick,
+    graphicsmagick,
     init-system-helpers,
     initscripts | sysvinit-utils,
     librsvg2-bin,

debian/qubes-core-agent.links

@@ -4,7 +4,7 @@
 
 ## MIME override stuff
 /usr/share/GConf /usr/share/qubes/xdg-override/GConf
-/usr/share/ImageMagick-6 /usr/share/qubes/xdg-override/ImageMagick-6
+/usr/share/GraphicsMagick-1.4 /usr/share/qubes/xdg-override/GraphicsMagick-1.4
 /usr/share/X11 /usr/share/qubes/xdg-override/X11
 /usr/share/aclocal /usr/share/qubes/xdg-override/aclocal
 /usr/share/alsa /usr/share/qubes/xdg-override/alsa

misc/data-dirs

@@ -1,5 +1,5 @@
 GConf
-ImageMagick-6
+GraphicsMagick-1.4
 X11
 aclocal
 alsa

qubes-rpc/qubes.GetImageRGBA

@@ -21,7 +21,7 @@ elif ! [ -r "${filename}" ]; then
     exit 1
 fi
 
-s="$(identify -format '%w %h %m' "$filename")"
+s="$(gm identify -format '%w %h %m' "$filename")"
 w="$(echo "$s"|cut -d " " -f 1)"
 h="$(echo "$s"|cut -d " " -f 2)"
 m="$(echo "$s"|cut -d " " -f 3)"
@@ -31,16 +31,16 @@ if [ "$m" = SVG ]; then
     # downscale the image if necessary
     if [ -n "$forcemaxsize" ] && \
             { [ "$w" -gt "$forcemaxsize" ] || [ "$h" -gt "$forcemaxsize" ]; }; then
-        convert "$tmpfile2" -scale "${forcemaxsize}x${forcemaxsize}" "$tmpfile2"
+        gm convert "$tmpfile2" -scale "${forcemaxsize}x${forcemaxsize}" "$tmpfile2"
         # read the size again, because icon may not be a square
-        s="$(identify -format '%w %h' "$tmpfile2")"
+        s="$(gm identify -format '%w %h' "$tmpfile2")"
         w="$(echo "$s"|cut -d " " -f 1)"
         h="$(echo "$s"|cut -d " " -f 2)"
     fi
     filename="$tmpfile2"
 fi
 echo "$w $h"
-convert -depth 8 -size "${w}x${h}" "$filename" rgba:-
+gm convert -depth 8 -size "${w}x${h}" "$filename" rgba:-
 
 if [ -n "${tmpfile}" ]; then
     rm -f "${tmpfile}"

rpm_spec/core-agent.spec.in

@@ -146,7 +146,7 @@ Requires:   python%{python3_pkgversion}-daemon
 Requires:   python%{python3_pkgversion}-qubesdb
 # for qubes.ShowInTerminal RPC service
 Requires:   socat
-Requires:   ImageMagick
+Requires:   GraphicsMagick
 Requires:   librsvg2-tools
 Requires:   zenity
 Requires:   dconf