[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.1.2.20070818-183-g2cbbfb5)
The branch, master has been updated
via 2cbbfb530707d215d81dd876afcc8e78beec646c (commit)
from e5f31fa0ba725c4a8a7dcacb47166a1468a357b6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
Makefile | 2 +-
libgeda/configure.ac | 13 +++++++++++++
libgeda/data/.gitignore | 3 +++
libgeda/data/Makefile.am | 12 ++++++++++++
libgeda/data/x-geda-gsch2pcb-project.desktop.in | 8 ++++++++
libgeda/data/x-geda-schematic.desktop.in | 8 ++++++++
libgeda/data/x-geda-symbol.desktop.in | 8 ++++++++
libgeda/po/POTFILES.in | 3 +++
8 files changed, 56 insertions(+), 1 deletions(-)
create mode 100644 libgeda/data/x-geda-gsch2pcb-project.desktop.in
create mode 100644 libgeda/data/x-geda-schematic.desktop.in
create mode 100644 libgeda/data/x-geda-symbol.desktop.in
=================
Commit Messages
=================
commit 2cbbfb530707d215d81dd876afcc8e78beec646c
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Dec 23 23:08:57 2007 +0000
Add .desktop versions of MIME registrations for older KDE desktops
Adds new ./configure option to libgeda, --with-kdedir=PATH. For system
wide installs, this should be left to its default, ${prefix}. If
installing in a home-directory, it should be set to /home/<USERID>/.kde
:100644 100644 a1e1abd... 2d3e0f1... M Makefile
:100644 100644 f5399b7... 13b64ed... M libgeda/configure.ac
:100644 100644 fe455ae... de765e9... M libgeda/data/.gitignore
:100644 100644 b4ea097... c85f896... M libgeda/data/Makefile.am
:000000 100644 0000000... 88aa913... A libgeda/data/x-geda-gsch2pcb-project.desktop.in
:000000 100644 0000000... ce5acfd... A libgeda/data/x-geda-schematic.desktop.in
:000000 100644 0000000... d0687e0... A libgeda/data/x-geda-symbol.desktop.in
:100644 100644 30b2e0d... 3388665... M libgeda/po/POTFILES.in
=========
Changes
=========
commit 2cbbfb530707d215d81dd876afcc8e78beec646c
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Dec 23 23:08:57 2007 +0000
Add .desktop versions of MIME registrations for older KDE desktops
Adds new ./configure option to libgeda, --with-kdedir=PATH. For system
wide installs, this should be left to its default, ${prefix}. If
installing in a home-directory, it should be set to /home/<USERID>/.kde
diff --git a/Makefile b/Makefile
index a1e1abd..2d3e0f1 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ prefix?=$(HOME)/geda
# You can set any global options you want here to be passed to the
# individual ./configure scripts
#
-opts=--with-xdgdir=$(HOME)/.local/share
+opts=--with-xdgdir=$(HOME)/.local/share --with-kdedir=$(HOME)/.kde/
#
# Set this to the shell that you want the various commands to run in.
diff --git a/libgeda/configure.ac b/libgeda/configure.ac
index f5399b7..13b64ed 100644
--- a/libgeda/configure.ac
+++ b/libgeda/configure.ac
@@ -26,6 +26,9 @@ AC_ARG_WITH(rcdir, [ --with-rcdir=path Change where the system-*rc files
# Change default location for XDG files (MIME and Icons)
AC_ARG_WITH(xdgdir, [ --with-xdgdir=path Change where the theme icons and mime registrations are installed [[DATAROOTDIR]]], [opt_xdgdir=$withval])
+# Change default location for KDE files (KDE MIME registrations)
+AC_ARG_WITH(kdedir, [ --with-kdedir=path Change where the KDE mime registrations are installed [[PREFIX]]], [opt_kdedir=$withval])
+
#
# Command line flags end
#########################################################################
@@ -411,6 +414,15 @@ else
fi
AC_SUBST(XDGDIR)
+if test x$opt_kdedir = x; then
+ # path was not specified with --with-kdedir
+ KDEDIR='${prefix}'
+else
+ # path WAS specified with --with-kdedir
+ KDEDIR="$opt_kdedir"
+fi
+AC_SUBST(KDEDIR)
+
# Defs for libary symbol files
#
# Expand the prefix variable
@@ -507,6 +519,7 @@ AC_MSG_RESULT([
data directory: $expandedGEDADATADIR
rc directory: $expandedGEDARCDIR
xdg directory: $expandedXDGDIR
+ KDE directory: $KDEDIR
LIBGEDA .so version: $SHARED_LIBRARY_VERSION
dmalloc debugging: $with_dmalloc
ElectricFence debugging: $with_efence
diff --git a/libgeda/data/.gitignore b/libgeda/data/.gitignore
index fe455ae..de765e9 100644
--- a/libgeda/data/.gitignore
+++ b/libgeda/data/.gitignore
@@ -1 +1,4 @@
libgeda.xml
+libgeda/data/x-geda-gsch2pcb-project.desktop
+libgeda/data/x-geda-schematic.desktop
+libgeda/data/x-geda-symbol.desktop
diff --git a/libgeda/data/Makefile.am b/libgeda/data/Makefile.am
index b4ea097..c85f896 100644
--- a/libgeda/data/Makefile.am
+++ b/libgeda/data/Makefile.am
@@ -32,6 +32,18 @@ xml_DATA = $(xml_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@
+kdedir=@KDEDIR@
+mimelnkdir = $(kdedir)/share/mimelnk
+applicationdir = $(mimelnkdir)/application
+
+application_in_files = \
+ x-geda-gsch2pcb-project.desktop.in \
+ x-geda-schematic.desktop.in \
+ x-geda-symbol.desktop.in
+application_DATA = $(application_in_files:.desktop.in=.desktop)
+
+@INTLTOOL_DESKTOP_RULE@
+
install_icon_exec = \
$(top_srcdir)/icon-theme-installer \
-t $(theme) \
diff --git a/libgeda/data/x-geda-gsch2pcb-project.desktop.in b/libgeda/data/x-geda-gsch2pcb-project.desktop.in
new file mode 100644
index 0000000..88aa913
--- /dev/null
+++ b/libgeda/data/x-geda-gsch2pcb-project.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Comment=gEDA gsch2pcb project
+MimeType=application/x-geda-gsch2pcb-project
+Type=MimeType
+Icon=application/x-geda-gsch2pcb-project
+Patterns=*.gsch2pcb;*.prj;
+X-KDE-IsAlso=text/plain
diff --git a/libgeda/data/x-geda-schematic.desktop.in b/libgeda/data/x-geda-schematic.desktop.in
new file mode 100644
index 0000000..ce5acfd
--- /dev/null
+++ b/libgeda/data/x-geda-schematic.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Comment=gEDA circuit schematic
+MimeType=application/x-geda-schematic
+Type=MimeType
+Icon=application-x-geda-schematic
+Patterns=*.sch
+X-KDE-IsAlso=text/plain
diff --git a/libgeda/data/x-geda-symbol.desktop.in b/libgeda/data/x-geda-symbol.desktop.in
new file mode 100644
index 0000000..d0687e0
--- /dev/null
+++ b/libgeda/data/x-geda-symbol.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Comment=gEDA schematic symbol
+MimeType=application/x-geda-symbol
+Type=MimeType
+Icon=application-x-geda-symbol
+Patterns=*.sym
+X-KDE-IsAlso=text/plain
diff --git a/libgeda/po/POTFILES.in b/libgeda/po/POTFILES.in
index 30b2e0d..3388665 100644
--- a/libgeda/po/POTFILES.in
+++ b/libgeda/po/POTFILES.in
@@ -1 +1,4 @@
data/libgeda.xml.in
+data/x-geda-gsch2pcb-project.desktop.in
+data/x-geda-schematic.desktop.in
+data/x-geda-symbol.desktop.in
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs