CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 08/02/16 23:13:00
Modified files:
server : character.h edit_text_character.h
packaging : snapshot.am install-gnash.sh
. : ChangeLog
Log message:
* server/edit_text_character.h, character.h: Put virtual before
the return type to eliminate a warning,
* packaging/install-gnash.sh: Drop GPL part, make uninstall work
correctly. Fix install path to use /usr/lib so we don't have to
hack ld.so.conf.
* packaging/snapshot.am: Don't bail om some errors, they're
normal
on some platforms. Add host_os to the tarball name.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.127&r2=1.128
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/snapshot.am?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/install-gnash.sh?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5670&r2=1.5671
Patches:
Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- server/character.h 12 Feb 2008 18:52:32 -0000 1.127
+++ server/character.h 16 Feb 2008 23:12:58 -0000 1.128
@@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: character.h,v 1.127 2008/02/12 18:52:32 bwy Exp $ */
+/* $Id: character.h,v 1.128 2008/02/16 23:12:58 rsavoye Exp $ */
#ifndef GNASH_CHARACTER_H
#define GNASH_CHARACTER_H
@@ -1142,7 +1142,7 @@
/// This method is used by Gui to set up an appropriate cursor
/// for input textfields.
///
- bool virtual isSelectableTextField() const { return false; }
+ virtual bool isSelectableTextField() const { return false; }
};
Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- server/edit_text_character.h 12 Feb 2008 08:28:43 -0000 1.68
+++ server/edit_text_character.h 16 Feb 2008 23:12:59 -0000 1.69
@@ -310,7 +310,7 @@
}
// See character::isActiveTextField
- bool virtual isSelectableTextField() const
+ virtual bool isSelectableTextField() const
{
return isSelectable();
}
Index: packaging/snapshot.am
===================================================================
RCS file: /sources/gnash/gnash/packaging/snapshot.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- packaging/snapshot.am 16 Feb 2008 17:58:50 -0000 1.4
+++ packaging/snapshot.am 16 Feb 2008 23:12:59 -0000 1.5
@@ -33,7 +33,7 @@
# rename it to the dir we want to stay clear. Then we change the default
# version from 'cvs' to a date stamped version of cvs, like '20080202cvs'
snapshot: distdir
- now=`date "+%Y%m%d"`; \
+ [EMAIL PROTECTED] "+%Y%m%d"`; \
pkgname="gnash-$${now}cvs"; \
snapshot_dir="$${pkgname}"; \
snapshot_tar="$${pkgname}.tar.gz"; \
@@ -52,7 +52,7 @@
# $(RM) -fr $${snapshot_dir}
snapshot-configure: snapshot
- @now=`date "+%Y%m%d"`; \
+ [EMAIL PROTECTED] "+%Y%m%d"`; \
pkgname="gnash-$${now}cvs"; \
snapshot_dir="$${pkgname}"; \
snapshot_build="$${snapshot_dir}/_build"; \
@@ -71,17 +71,19 @@
--infodir=/usr/share/info \
--with-plugindir=$${plugindir} \
--disable-static
-# --enable-docbook
# --with-extensions=all
# --enable-gui=all
snapshot-build: snapshot-configure
- @now=`date "+%Y%m%d"`; \
+ [EMAIL PROTECTED] "+%Y%m%d"`; \
pkgname="gnash-$${now}cvs"; \
snapshot_dir="$${pkgname}"; \
snapshot_build="$${snapshot_dir}/_build"; \
+ $(LN_S) -f $${snapshot_build}/packaging/doc
$${snapshot_build}/packaging/; \
$(MAKE) $(AM_MAKEFLAGS) -C $${snapshot_build} all
+# Install a package. Afterwards we link to the prebuilt man pages incase
+# DocBook and DocBook2X aren't installed on this machine.
snapshot-install: #snapshot-build
now=`date "+%Y%m%d"`; \
snapshot_dir="gnash-$${now}cvs"; \
@@ -92,11 +94,11 @@
# We only want to bundle an installed gnash, so all the linker paths are
# correct
snapshot-bundle: #snapshot-install
- now=`date "+%Y%m%d"`; \
+ [EMAIL PROTECTED] "+%Y%m%d"`; \
pkgname="gnash-$${now}cvs"; \
snapshot_dest="/tmp/$${pkgname}-tmp"; \
snapshot_tmp="/tmp/$${pkgname}"; \
- snapshot_tar="$${snapshot_tmp}-$(host_cpu).tar.gz"; \
+ snapshot_tar="$${snapshot_tmp}-$(host_cpu)-$(host_os).tar.gz"; \
if test ! -d $${snapshot_tmp}; then \
$(MKINSTALLDIRS) $${snapshot_tmp}; \
fi; \
@@ -116,7 +118,7 @@
tar zcvCf /tmp $${snapshot_tar} $${pkgname}
snapshot-rpm: snapshot $(srcdir)/packaging/redhat/gnash.spec
- rm -f /usr/src/redhat/SPECS/gnash.spec
+ [EMAIL PROTECTED] -f /usr/src/redhat/SPECS/gnash.spec
now=`date "+%Y%m%d"`; \
pkgname="gnash-$${now}cvs"; \
snapshot_tar="$${pkgname}.tar.gz"; \
@@ -125,7 +127,7 @@
rpmbuild -ba --clean --rmsource --rmspec
/usr/src/redhat/SPECS/gnash.spec
snapshot-clean:
- rm -fr snapshot-* $(SNAPSHOT_BUILD) $(SNAPSHOT_TMP)
gnash*$(VERSION)*.ipk
+ [EMAIL PROTECTED] -fr snapshot-* $(SNAPSHOT_BUILD) $(SNAPSHOT_TMP)
gnash*$(VERSION)*.ipk
# .PHONY : snapshot
Index: packaging/install-gnash.sh
===================================================================
RCS file: /sources/gnash/gnash/packaging/install-gnash.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- packaging/install-gnash.sh 10 Feb 2008 06:51:18 -0000 1.6
+++ packaging/install-gnash.sh 16 Feb 2008 23:12:59 -0000 1.7
@@ -25,7 +25,7 @@
kdedeps="kdebase qt"
missing=""
-os=`config.guess`
+os=`./config.guess`
case $os in
*i*86-*-linux*)
@@ -46,10 +46,10 @@
# for this, as it just displays the commands to the screen.
debug=
-# set 'yes' to 'yes', and you don't get asked for prompts.
-# Use with care!!! Note that setting this to yes obligates the user
-# to having agreed to the GPLv3 license when executing this script.
-yes=yes
+# set 'yes' to 'yes', and you don't get asked for prompts. Set to 'no'
+# for the default behaviour. Use with care!!!
+yes=no
+
# aliases for a few commands to force debug mode while still leaving
# the rest of this code readable.
@@ -58,29 +58,6 @@
MOVE="$debug mv -f"
#
-# Display the GPLv3, and get the users agreement before proceeding
-#
-gpl ()
-{
- # display the GPLv3
- cat COPYING
-
- # make sure the user agrees
- if [ x$yes = xno ]; then
- read -p "Do you agree to the terms of this license? (yes or no) " answer
- else
- answer="$yes"
- echo "NOTE: You have the install script set to \"yes always\" mode"
- echo "NOTE: This means by default you have agree to the terms of the GPLv3"
- fi
-
- if [ x$answer != xyes ] ; then
- echo "Sorry, then you can't install Gnash..."
- exit
- fi
-}
-
-#
# Find an executable file that needs to be in our shell PATH.
#
findbin ()
@@ -99,6 +76,44 @@
return
}
+#
+# See if we can figure out which GNU/Linux or BSD distribution we are running
+#
+findrelease ()
+{
+ # Ubuntu uses /etc/lsb-release
+ if [ -f /etc/lsb-release ]; then
+ release_name="`grep DISTRIB_ID /etc/lsb-release`"
+ release_version="`grep DISTRIB_RELEASE /etc/lsb-release`"
+ return
+ fi
+
+ # Redhat, Fedora, and Centos all use /etc/redhat-release
+ if [ -f /etc/redhat-release ]; then
+ release_name="`cat /etc/redhat-release | cut -d ' ' -f 1`"
+ release_version="`cat /etc/redhat-release | cut -d ' ' -f 3`"
+ return
+ fi
+
+ # Debian uses /etc/issue. Fedora uses /etc/issue too, but we
+ # don't need it now.
+ if [ -f /etc/issue ]; then
+ release_name="`cat /etc/issue | cut -d ' ' -f 1`"
+ release_version="`cat /etc/issue | cut -d ' ' -f 3`"
+ return
+ fi
+
+ # OpenBSD doesn't appear to use anything, but by default motd does
+ # have the distro name and version, so we try that as most people
+ # never bother to change their motd message anyway.
+ if [ -f /etc/motd ]; then
+ release_name="`cat /etc/motd | head -1 | cut -d ' ' -f 1`"
+ release_version="`cat /etc/motd | head -1 | cut -d ' ' -f 2`"
+ return
+ fi
+
+}
+
# This script has a split personality in that it works in an
# unconfigured tree, as well as a version with the paths munged
# by the normal Gnash configuration process. This way we can
@@ -117,7 +132,7 @@
# as well as were these files get installed to.
rootdir="@prefix@"
if [ x"${rootdir}" = x"@prefix@" ]; then
- rootdir="/usr/local"
+ rootdir="/usr"
fi
# This is where the NSAPI (any Geeko based browser like Mozilla,
@@ -234,8 +249,8 @@
# of them to return to a stable state.
preexisting ()
{
- if [ -d ${rootdir}/lib/gnash ]; then
- existing=`ls -d ${rootdir}/lib/gnash/libgnashbase-*.so* 2> /dev/null`
+ if [ -d ${rootdir}/lib/gnash -o -d ${rootdir}/lib ]; then
+ existing=`ls -d ${rootdir}/lib/gnash/libgnashbase*.so*
${rootdir}/lib/libgnashbase*.so 2> /dev/null`
if [ -n "${existing}" ]; then
echo ""
echo "You have previous installations of Gnash"
@@ -245,20 +260,16 @@
done
echo "version: $files"
echo "These should to be removed for the best stability of Gnash"
- if [ x$yes = xno ]; then
- read -p "Do you wish to remove these old versions ? " answer
- else
- answer="$yes"
+ if [ x$yes != xyes ]; then
+ read -p "Do you wish to remove these old versions ? [yes] " answer
fi
- if [ x$answer = xyes ]; then
+ if [ x$answer = xyes -o x$answer = xy ]; then
for i in $files; do
- if [ x$yes = xno ]; then
- read -p "Remove Gnash version \"$i\"? " answer
- else
- answer="$yes"
+ if [ x$yes != xyes ]; then
+ read -p "Remove Gnash version \"$i\"? [yes] " answer
fi
- if [ x$answer = xyes ]; then
- ${REMOVE} $rootdir/lib/gnash/libgnash*-$i.*
+ if [ x$answer = xyes -o x$answer = xy ]; then
+ ${REMOVE} $rootdir/lib/libgnash*
fi
done
fi
@@ -272,30 +283,24 @@
done
echo "GUIS: $files"
echo "These should to be removed for the best stability of Gnash"
- if [ x$yes = xno ]; then
- read -p "Do you wish to remove these old versions ? " answer
- else
- answer="$yes"
+ if [ x$yes != xyes ]; then
+ read -p "Do you wish to remove these old versions ? [yes] " answer
fi
- if [ x$answer = xyes ]; then
+ if [ x$answer = xyes -o x$answer = xy ]; then
for i in $files; do
- if [ x$yes = xno ]; then
- read -p "Remove Gnash GUI \"$i\"? " answer
- else
- answer="$yes"
+ if [ x$yes != xyes ]; then
+ read -p "Remove Gnash GUI \"$i\"? [yes] " answer
fi
- if [ x$answer = xyes ]; then
- ${REMOVE} $rootdir/bin/gnash/$i-gnash
+ if [ x$answer = xyes -o x$answer = xy ]; then
+ ${REMOVE} $rootdir/bin/$i-gnash
fi
done
fi
- if [ x$yes = xno ]; then
- read -p "Do you wish to remove the gnash shell script too ? " answer
- else
- answer="$yes"
+ if [ x$yes != xyes ]; then
+ read -p "Do you wish to remove the gnash shell script too ? [yes] "
answer
fi
- if [ x$answer = xyes ]; then
- ${REMOVE} $rootdir/bin/gnash/gnash
+ if [ x$answer = xyes -o x$answer = xy ]; then
+ ${REMOVE} $rootdir/bin/gnash
fi
fi
else
@@ -351,19 +356,13 @@
exit
fi
- # install the documentation
- if [ -e gnash.pdf -o x$yes = xyes ]; then
- $debug mkdir -p /usr/share/doc/gnash
- ${COPY} gnash.pdf /usr/share/doc/gnash
- fi
-
# copy the ld.so.conf file
# if [ ! -f /etc/ld.so.conf.d/gnash.conf ]; then
# echo " /usr/lib/gnash" > /etc/ld.so.conf.d/gnash.conf
# fi
# # run ldconfig so the shared libraries can be found.
-# ldconfig
+ ldconfig
}
#
@@ -478,8 +477,16 @@
echo "ERROR: You need to specify an argument for rootdir="
fi
;;
+ uninstall)
+ checkdirs
+ preexisting
+ exit 0
+ ;;
dump)
yes=yes
+ findrelease
+ echo "Release name is: ${release_name}"
+ echo "Release version is: ${release_version}"
checkdirs
echo ""
echo "Default paths are: "
@@ -512,8 +519,6 @@
#
# Here's where everything actually gets executed
#
-# Go through the license agreement
-gpl
# Check the directory permissions first
checkdirs
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5670
retrieving revision 1.5671
diff -u -b -r1.5670 -r1.5671
--- ChangeLog 16 Feb 2008 17:58:50 -0000 1.5670
+++ ChangeLog 16 Feb 2008 23:12:59 -0000 1.5671
@@ -1,8 +1,15 @@
2008-02-16 Rob Savoye <[EMAIL PROTECTED]>
+ * server/edit_text_character.h, character.h: Put virtual before
+ the return type to eliminate a warning,
+ * packaging/install-gnash.sh: Drop GPL part, make uninstall work
+ correctly. Fix install path to use /usr/lib so we don't have to
+ hack ld.so.conf.
+
* packaging/snapshot.am: Set the name higher up so we don't have
to add "cvs" everywhere for the snapshot version. Build the
- tarball with the correct path.
+ tarball with the correct path. Don't bail om some errors, they're
+ normal on some platforms. Add host_os to the tarball name.
* doc/C/dumpshm-man.xml, gprocessor-man.xml, soldumper-man.xml,
gnash-man.xml: Rename all man page source to *.man-xml so we can
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
