Add desktop files and pixmaps

Also LDFLAGS in gen.sh
Conflicts:
	data/Makefile.am

diff --git a/data/.gitignore b/data/.gitignore
index 13c906e0a3edc76b6e832ece17e82a7a1ed74bc8..0d9808b1be4fce9d07376031fd4773b7c35f4bbd 100644 (file)
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1 +1,2 @@
 aweather
+*.png

diff --git a/data/Makefile.am b/data/Makefile.am
index 3ceed018d973f55e48042f4f2860c7b3fd854774..dec41445d7cf02fc73f45febfb473b7e38ca7999 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,14 @@
 gtkbuilderdir = $(datadir)/aweather/
 dist_gtkbuilder_DATA = main.ui
 
+desktopdir = $(datadir)/applications
+dist_desktop_DATA = aweather.desktop
+
+pixmapdir = $(datadir)/pixmaps
+dist_pixmap_DATA = aweather.png
+
+.svg.png:
+       convert $< $@
+
 maintainer-clean-local:
        rm -f Makefile.in

diff --git a/data/aweather.desktop b/data/aweather.desktop
new file mode 100644 (file)
index 0000000..7019aca
--- /dev/null
+++ b/data/aweather.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=AWeather
+Comment=Advanced weather reporting program
+Exec=aweather
+Terminal=false
+Icon=aweather.png
+Categories=Education;Science;Geoscience

diff --git a/data/aweather.svg b/data/aweather.svg
new file mode 100644 (file)
index 0000000..f5dadbd
--- /dev/null
+++ b/data/aweather.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="150" height="150">
+
+       <title>thundery showers</title>
+
+       <rect width="150" height="150" fill="#3be" stroke="none"/>
+
+       <g style="stroke-width:7;stroke:#ff0">
+               <line x1="2" y1="67" x2="19" y2="67" transform="rotate(-20, 55, 67)" />
+               <line x1="2" y1="67" x2="19" y2="67" transform="rotate(4, 55, 67)" />
+               <line x1="2" y1="67" x2="19" y2="67" transform="rotate(28, 55, 67)" />
+               <line x1="2" y1="67" x2="19" y2="67" transform="rotate(52, 55, 67)" />
+               <line x1="2" y1="67" x2="19" y2="67" transform="rotate(76, 55, 67)" />
+       </g>
+
+
+       <g fill="none" stroke-width="12" stroke-linecap="round" stroke="#666" >
+               <path d="M 75 55 A 23 23, 0, 1, 0 55,90 L 60,90"/>
+               <path d="M 110,90 115,90 A 21 21, 0, 1, 0 115,45" />
+               <path d="M 105 60 A 25 25, 0, 1, 0 65,45 "  />
+       </g>
+
+       <polygon points="82,110 67,110 82,80 97,80 87,100 102,100 67,150" stroke="none" fill="#dee" />
+
+</svg>

diff --git a/gen.sh b/gen.sh
index cc9042c89f1f7017e16a8c0a028d050f79766b37..ab1a7d952ea6e7ff5a1177034bd0980725e23b4c 100755 (executable)
--- a/gen.sh
+++ b/gen.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 dir=$(dirname $(readlink -f $0))
-CFLAGS="-g" \
 ./autogen.sh \
        "--libdir=$dir/src/plugins" \
        "--datadir=$dir/data" \
-       --enable-gtk-doc
+       --enable-gtk-doc \
+       CFLAGS="-g" \
+       LDFLAGS="-Wl,-z,defs"

diff --git a/src/plugins/ridge.c b/src/plugins/ridge.c
index a25bd59b1a94368037754f27e1b4d44d3df9727c..b42b6a7a6236a8416ebafa3dae233de75a212424 100644 (file)
--- a/src/plugins/ridge.c
+++ b/src/plugins/ridge.c
@@ -18,7 +18,6 @@
 #include <config.h>
 #include <stdio.h>
 #include <gtk/gtk.h>
-#include <curl/curl.h>
 #include <GL/gl.h>
 
 #include <gis/gis.h>