From 8ce3859df5a0f2cbe93fcf9af5a24c18d3583f09 Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Sat, 24 Oct 2009 18:58:55 +0000
Subject: [PATCH] Add desktop files and pixmaps

Also LDFLAGS in gen.sh
Conflicts:
	data/Makefile.am
---
 data/.gitignore       |  1 +
 data/Makefile.am      |  9 +++++++++
 data/aweather.desktop |  8 ++++++++
 data/aweather.svg     | 25 +++++++++++++++++++++++++
 gen.sh                |  5 +++--
 src/plugins/ridge.c   |  1 -
 6 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 data/aweather.desktop
 create mode 100644 data/aweather.svg

diff --git a/data/.gitignore b/data/.gitignore
index 13c906e..0d9808b 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1 +1,2 @@
 aweather
+*.png
diff --git a/data/Makefile.am b/data/Makefile.am
index 3ceed01..dec4144 100644
--- 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
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
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 cc9042c..ab1a7d9 100755
--- 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 a25bd59..b42b6a7 100644
--- 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>
-- 
2.43.2