[Lunar-commits] flash: fixes for konqueror. Clean ups.

Zbigniew Luszpinski zbiggy at lunar-linux.org
Thu Jan 24 04:24:14 CET 2008


commit da06a9f5d9f1fd11a943aaab68caafd15e5aa1a2
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Thu Jan 24 04:24:14 2008 +0100

    flash: fixes for konqueror. Clean ups.
---
 graphics/gtk+-2/BUILD             |    1 +
 graphics/gtk+-2/DETAILS           |    5 ++++-
 web/flash-plugin-9/CONFLICTS      |    3 +--
 web/flash-plugin-all/BUILD        |    9 +++++++++
 web/flash-plugin-all/CONFLICTS    |    1 +
 web/flash-plugin-all/DETAILS      |   17 +++++++++++++++++
 web/flash-plugin/BUILD            |   16 ----------------
 web/flash-plugin/CONFLICTS        |    2 --
 web/flash-plugin/DETAILS          |   16 ----------------
 zbeta/flash-plugin-beta/BUILD     |    8 --------
 zbeta/flash-plugin-beta/CONFLICTS |    2 --
 zbeta/flash-plugin-beta/DETAILS   |   19 -------------------
 12 files changed, 33 insertions(+), 66 deletions(-)

diff --git a/graphics/gtk+-2/BUILD b/graphics/gtk+-2/BUILD
index 60a4608..bab3d15 100644
--- a/graphics/gtk+-2/BUILD
+++ b/graphics/gtk+-2/BUILD
@@ -5,6 +5,7 @@
      OPTS="$OPTS --with-xinput=yes --enable-debug=no"
   fi
 
+  patch_it $SOURCE2 0 &&
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/graphics/gtk+-2/DETAILS b/graphics/gtk+-2/DETAILS
index 2079db2..a95ab15 100644
--- a/graphics/gtk+-2/DETAILS
+++ b/graphics/gtk+-2/DETAILS
@@ -1,13 +1,16 @@
           MODULE=gtk\+-2
          VERSION=12.5
           SOURCE=$MODULE.$VERSION.tar.bz2
+         SOURCE2=flash-fix.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE.$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/gtk+/2.12/
    SOURCE_URL[1]=ftp://ftp.gtk.org/pub/gtk/v2.12/
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:0ba6fb8b4e5a6a7972581e0ea6e9e8e8f81b991a
+     SOURCE2_VFY=sha1:ed07cf3d2a7ee26f53f414ec5cd4d0f1b4514249
         WEB_SITE=http://www.gtk.org/
          ENTERED=20020313
-         UPDATED=20080112
+         UPDATED=20080124
            SHORT="A multi-platform toolkit for creating GUIs"
 
 cat << EOF
diff --git a/web/flash-plugin-9/CONFLICTS b/web/flash-plugin-9/CONFLICTS
index 3501451..e06d247 100644
--- a/web/flash-plugin-9/CONFLICTS
+++ b/web/flash-plugin-9/CONFLICTS
@@ -1,2 +1 @@
-conflicts flash-plugin
-conflicts flash-plugin-beta
+conflicts flash-plugin-all
diff --git a/web/flash-plugin-all/BUILD b/web/flash-plugin-all/BUILD
new file mode 100644
index 0000000..5de6520
--- /dev/null
+++ b/web/flash-plugin-all/BUILD
@@ -0,0 +1,9 @@
+(
+
+  cd $SOURCE_DIRECTORY             &&
+  prepare_install                  &&
+  mkdir -p /opt/lunar/plugins      &&
+  install -m755 libflashplayer.so \
+                flashplayer.xpt /opt/lunar/plugins
+
+) > $C_FIFO 2>&1
diff --git a/web/flash-plugin-all/CONFLICTS b/web/flash-plugin-all/CONFLICTS
new file mode 100644
index 0000000..5be5415
--- /dev/null
+++ b/web/flash-plugin-all/CONFLICTS
@@ -0,0 +1 @@
+conflicts flash-plugin-9
diff --git a/web/flash-plugin-all/DETAILS b/web/flash-plugin-all/DETAILS
new file mode 100644
index 0000000..38899ec
--- /dev/null
+++ b/web/flash-plugin-all/DETAILS
@@ -0,0 +1,17 @@
+          MODULE=flash-plugin-all
+         VERSION=9.0.48
+          SOURCE=flash-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/install_flash_player_9_linux
+      SOURCE_URL=$PATCH_URL
+      SOURCE_VFY=sha1:4bba0b81462394388b4509ecdc845f469c95d6ae
+        WEB_SITE=http://www.adobe.com/
+         ENTERED=20021207
+         UPDATED=20080124
+           SHORT="Macromedia Flash plugin for web browsers"
+
+cat << EOF
+Macromedia Flash is a commonly used format for web animations.  This is
+the web browser plugin for Linux. It works with any browser supporting
+Netscape-style plugins, including Konqueror/Opera/Firefox/Seamonkey
+and descendants.
+EOF
diff --git a/web/flash-plugin/BUILD b/web/flash-plugin/BUILD
deleted file mode 100644
index a67a6c0..0000000
--- a/web/flash-plugin/BUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-
-  cd $SOURCE_DIRECTORY             &&
-  prepare_install                  &&
-  mkdir -p /opt/lunar/plugins      &&
-  install -m755 libflashplayer.so \
-                flashplayer.xpt /opt/lunar/plugins &&
-
-  gather_docs Readme.txt Readme.htm &&
-
-  # We need to remove the tarball since its seemingly identical
-  # to every release
-
-  rm -f $SOURCE_CACHE/$SOURCE
-
-) > $C_FIFO 2>&1
diff --git a/web/flash-plugin/CONFLICTS b/web/flash-plugin/CONFLICTS
deleted file mode 100644
index 495d4e0..0000000
--- a/web/flash-plugin/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts flash-plugin-9
-conflicts flash-plugin-beta
diff --git a/web/flash-plugin/DETAILS b/web/flash-plugin/DETAILS
deleted file mode 100644
index 9f6a5d6..0000000
--- a/web/flash-plugin/DETAILS
+++ /dev/null
@@ -1,16 +0,0 @@
-          MODULE=flash-plugin
-         VERSION=7.0.69.0
-          SOURCE=install_flash_player_7_linux.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/install_flash_player_7_linux
-      SOURCE_URL=http://fpdownload.macromedia.com/get/flashplayer/current/
-      SOURCE_VFY=sha1:d026e88f7678d0b16826777e21e0744827ceec37
-        WEB_SITE=http://www.adobe.com/
-         ENTERED=20021207
-         UPDATED=20061209
-           SHORT="Macromedia Flash plugin for netscape and mozilla"
-
-cat << EOF
-Macromedia Flash is a commonly used format for web animations.  This is
-the Netscape plugin for Linux. It works with any browser supporting
-Netscape-style plugins, including mozilla and descendants.
-EOF
diff --git a/zbeta/flash-plugin-beta/BUILD b/zbeta/flash-plugin-beta/BUILD
deleted file mode 100644
index 9d15abe..0000000
--- a/zbeta/flash-plugin-beta/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-(
-
-  cd $SOURCE_DIRECTORY             &&
-  prepare_install                  &&
-  mkdir -p /opt/lunar/plugins      &&
-  install -m755 libflashplayer.so /opt/lunar/plugins
-
-) > $C_FIFO 2>&1
diff --git a/zbeta/flash-plugin-beta/CONFLICTS b/zbeta/flash-plugin-beta/CONFLICTS
deleted file mode 100644
index 1d61d25..0000000
--- a/zbeta/flash-plugin-beta/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts flash-plugin
-conflicts flash-plugin-9
diff --git a/zbeta/flash-plugin-beta/DETAILS b/zbeta/flash-plugin-beta/DETAILS
deleted file mode 100644
index 94cd8d3..0000000
--- a/zbeta/flash-plugin-beta/DETAILS
+++ /dev/null
@@ -1,19 +0,0 @@
-          MODULE=flash-plugin-beta
-         VERSION=9.0.64.0
-          SOURCE=flashplayer9_install_linux_100107.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/install_flash_player_9_linux
-      SOURCE_URL=http://download.macromedia.com/pub/labs/flashplayer9_update/
-      SOURCE_VFY=sha1:a1c7d4726d48ef1cf252a5b52e8461762b8c429f
-        WEB_SITE=http://www.adobe.com/
-         ENTERED=20021207
-         UPDATED=20071001
-           SHORT="Macromedia Flash plugin for netscape and mozilla"
-
-cat << EOF
-Macromedia Flash is a commonly used format for web animations.  This is
-the Netscape plugin for Linux. It works with any browser supporting
-Netscape-style plugins, including mozilla and descendants.
-
-Warning! This version will NOT work with Opera or Konqueror browsers!!!
-The result will be white box in place where flash content should be.
-EOF


More information about the Lunar-commits mailing list