[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-120-g2b014bf |
|
Date: |
Wed, 23 Feb 2011 09:23:54 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 2b014bf8faeab60a2d1a3949c01927b4920425b0 (commit)
via 67eb9b32b10368764e1320140451537bd2e49591 (commit)
via 36ee6e5ae73a3e7a03587ab734d429d798f730a1 (commit)
from 414f77a41775378903e24603aa97f0228036fa18 (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.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=2b014bf8faeab60a2d1a3949c01927b4920425b0
commit 2b014bf8faeab60a2d1a3949c01927b4920425b0
Author: Hicham HAOUARI <address@hidden>
Date: Tue Feb 15 18:21:59 2011 +0000
Add desktop files
diff --git a/Makefile.am b/Makefile.am
index d3037a7..1843ce8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,6 +49,7 @@ CYGNAL_DIR = cygnal
endif
STD_DIRS = \
+ desktop \
libbase \
libmedia \
libsound \
diff --git a/configure.ac b/configure.ac
index b614c1f..24ac2fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2952,9 +2952,14 @@
AC_CONFIG_LINKS(cygnal/testsuite/cygnal.all/cygnalrc:cygnal/testsuite/cygnal.all
AC_CONFIG_LINKS(testsuite/libbase.all/gnashrc:testsuite/libbase.all/gnashrc.in)
AC_CONFIG_LINKS(testsuite/libbase.all/gnashrc-local:testsuite/libbase.all/gnashrc-local.in)
-AC_CONFIG_FILES(gnash.pc:gnash.pc.in)
+AC_CONFIG_FILES(
+gnash.pc:gnash.pc.in
+gui/gnash:gui/gnash.in
+gui/klash:gui/klash.in
+)
AC_OUTPUT(Makefile
+desktop/Makefile
po/Makefile
libltdl/Makefile
libmedia/Makefile
diff --git a/desktop/Makefile.am b/desktop/Makefile.am
new file mode 100644
index 0000000..92150eb
--- /dev/null
+++ b/desktop/Makefile.am
@@ -0,0 +1,36 @@
+desktopdir = $(datadir)/applications
+desktop_DATA =
+
+icons32dir = $(datadir)/icons/hicolor/32x32/apps
+icons32_DATA =
+
+splashdir = $(pkgdatadir)
+splash_DATA = gnash-splash.swf
+
+if BUILD_GTK_GUI
+desktop_DATA += gnash.desktop
+icons32_DATA += ../packaging/gnash.xpm
+endif
+
+if BUILD_KDE4_GUI
+desktop_DATA += klash.desktop
+icons32_DATA += ../packaging/klash.xpm
+endif
+
+validate-gnash-desktop: gnash.desktop
+ ( dfvalidate=`which desktop-file-validate`; \
+ if test x$$dfvalidate != x && test -x $$dfvalidate; then \
+ $$dfvalidate $< || ( echo "* $< INVALID *"; exit 1 ) \
+ else \
+ echo "Can't find desktop-file-validate to validate $<; proceed
with fingers crossed..."; \
+ fi )
+
+validate-klash-desktop: klash.desktop
+ ( dfvalidate=`which desktop-file-validate`; \
+ if test x$$dfvalidate != x && test -x $$dfvalidate; then \
+ $$dfvalidate $< || ( echo "* $< INVALID *"; exit 1 ) \
+ else \
+ echo "Can't find desktop-file-validate to validate $<; proceed
with fingers crossed..."; \
+ fi )
+
+install-data-hook: validate-gnash-desktop validate-klash-desktop
diff --git a/desktop/gnash-splash.swf b/desktop/gnash-splash.swf
new file mode 100644
index 0000000..52a4c17
Binary files /dev/null and b/desktop/gnash-splash.swf differ
diff --git a/desktop/gnash.desktop b/desktop/gnash.desktop
new file mode 100644
index 0000000..98c4c5a
--- /dev/null
+++ b/desktop/gnash.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Gnash SWF Viewer
+GenericName=SWF Viewer
+Comment=View SWF Files
+Icon=gnash
+Exec=gnash %U
+Terminal=false
+Categories=AudioVideo;Video;Player;GTK;
+MimeType=application/x-shockwave-flash;application/futuresplash;
diff --git a/desktop/klash.desktop b/desktop/klash.desktop
new file mode 100644
index 0000000..6efab62
--- /dev/null
+++ b/desktop/klash.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Gnash SWF Viewer for KDE
+GenericName=SWF Viewer
+Comment=View SWF Files
+Icon=klash
+Exec=klash %U
+Terminal=false
+Categories=AudioVideo;Qt;KDE;
+MimeType=application/x-shockwave-flash;application/futuresplash;
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 4e997b7..57d2ac1 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -187,9 +187,9 @@ imagesdir = $(pkgdatadir)
bin_SCRIPTS = gnash
bin_PROGRAMS =
-gnash: gnash.in
- cp $(srcdir)/gnash.in $@
- chmod +x $@
+if BUILD_KDE4_GUI
+bin_SCRIPTS += klash
+endif
# Always include the device files in the source tarball
EXTRA_DIST += \
diff --git a/gui/gnash.in b/gui/gnash.in
index ca0f16d..595710c 100755
--- a/gui/gnash.in
+++ b/gui/gnash.in
@@ -57,7 +57,11 @@ fi
for gui in ${gui} ${GUIS}; do
exe=${THIS_DIR}/${gui}-gnash
if test -e ${exe}; then
- exec ${exe} "$@"
+ if test "x$1" = "x" -a -f @datadir@/gnash/gnash-splash.swf -a
"${gui}" = "gtk";then
+ exec ${exe} @datadir@/gnash/gnash-splash.swf
+ else
+ exec ${exe} "$@"
+ fi
fi
done
diff --git a/gui/klash.in b/gui/klash.in
new file mode 100644
index 0000000..199598d
--- /dev/null
+++ b/gui/klash.in
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+#
+# klash: Wrapper script for running the KDE version of gnash
+#
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+if test "x$1" = "x" -a -f @datadir@/gnash/gnash-splash.swf; then
+ kde4-gnash @datadir@/gnash-splash.swf
+else
+ kde4-gnash "$@"
+fi
http://git.savannah.gnu.org/cgit//commit/?id=67eb9b32b10368764e1320140451537bd2e49591
commit 67eb9b32b10368764e1320140451537bd2e49591
Author: Benjamin Wolsey <address@hidden>
Date: Tue Feb 22 11:35:54 2011 +0100
Clean up apidocs.
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index a18134f..c196b4e 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -340,7 +340,7 @@ EXCLUDE_SYMLINKS = NO
# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
# certain files from those directories.
-EXCLUDE_PATTERNS = */examples/* */mozilla-sdk/* */win32/*
*/backend/render_handler_agg_compat.h *.git *.bzr
+EXCLUDE_PATTERNS = */examples/* */mozilla-sdk/* */cygnal/*
*/libbase/tree.hh */win32/* */backend/render_handler_agg_compat.h *.git *.bzr
*/testsuite/*
# The EXAMPLE_PATH tag can be used to specify one or more files or
# directories that contain example code fragments that are included (see
http://git.savannah.gnu.org/cgit//commit/?id=36ee6e5ae73a3e7a03587ab734d429d798f730a1
commit 36ee6e5ae73a3e7a03587ab734d429d798f730a1
Author: Benjamin Wolsey <address@hidden>
Date: Tue Feb 22 09:31:04 2011 +0100
Correct includes
diff --git a/libbase/URL.cpp b/libbase/URL.cpp
index a28361a..c4db634 100644
--- a/libbase/URL.cpp
+++ b/libbase/URL.cpp
@@ -16,9 +16,9 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#include <iostream>
#include "URL.h"
+#include <iostream>
#include <string>
#include <cstring>
#include <vector>
@@ -26,7 +26,9 @@
#include <sstream>
#include <algorithm>
#include <cerrno>
-#include <GnashException.h>
+#include <boost/tokenizer.hpp>
+#include <boost/scoped_array.hpp>
+#include <cctype>
// This is for getcwd(2)
@@ -36,8 +38,7 @@
# include <direct.h>
#endif
-#include <boost/tokenizer.hpp>
-#include <boost/scoped_array.hpp>
+#include "GnashException.h"
namespace gnash {
@@ -409,21 +410,21 @@ URL::decode(std::string& input)
for (unsigned int i=0; i<input.length(); i++) {
if (input[i] == '%' && (input.length() > i + 2) &&
- isxdigit(input[i+1]) && isxdigit(input[i+2])) {
- input[i+1] = toupper(input[i+1]);
- input[i+2] = toupper(input[i+2]);
- if (isdigit(input[i+1])) {
+ std::isxdigit(input[i+1]) && std::isxdigit(input[i+2])) {
+ input[i+1] = std::toupper(input[i+1]);
+ input[i+2] = std::toupper(input[i+2]);
+ if (std::isdigit(input[i+1])) {
hexcode = (input[i+1] - '0') * 16;
} else {
hexcode = (input[i+1] - 'A' + 10) * 16;
}
- if (isdigit(input[i+2])) {
+ if (std::isdigit(input[i+2])) {
hexcode += (input[i+2] - '0');
} else {
hexcode += (input[i+2] - 'A' + 10);
}
- input[i] = (char)hexcode;
+ input[i] = hexcode;
input.erase(i+1, 2);
} else if ( input[i] == '+' ) {
input[i] = ' ';
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 +
configure.ac | 7 +++-
desktop/Makefile.am | 36 ++++++++++++++++++++
desktop/gnash-splash.swf | Bin 0 -> 12799 bytes
.../gnash.desktop.in => desktop/gnash.desktop | 7 +---
desktop/klash.desktop | 10 +++++
doc/Doxyfile.in | 2 +-
gui/Makefile.am | 6 ++--
gui/gnash.in | 6 +++-
packaging/bsd.am => gui/klash.in | 32 ++++++++----------
libbase/URL.cpp | 21 ++++++-----
11 files changed, 89 insertions(+), 39 deletions(-)
create mode 100644 desktop/Makefile.am
create mode 100644 desktop/gnash-splash.swf
copy packaging/debian/gnash.desktop.in => desktop/gnash.desktop (71%)
create mode 100644 desktop/klash.desktop
copy packaging/bsd.am => gui/klash.in (70%)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-120-g2b014bf,
Benjamin Wolsey <=