callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk+2.0 (2.8.7-1) experimental; urgency=low

Browse Source 
* New upstream version.
  * Security fixes:
    - Add check to XPM reader to prevent integer overflow for specially crafted
      number of colors (CVE-2005-3186) (Closes: #339431).
    - Fix endless loop with specially crafted number of colors (CVE-2005-2975).
  * debian/patches/001_fs_documents.patch:
    - updated.
  * debian/rules:
    - fix confusing cp usage.

  [ Loic Minier ]
  * Drop xlibs-dev deps and build-deps.
    [debian/control, debian/control.in]

 -- Sebastien Bacher <seb128@debian.org>  Wed, 16 Nov 2005 11:54:11 +0100
This commit is contained in:
Sebastien Bacher
2005-11-16 15:39:36 +00:00
parent b9a0133e50
commit 7f89acd673
9 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
debian/changelog vendored
View File

@ -1,9 +1,20 @@
gtk+2.0 (2.8.3-2) UNRELEASED; urgency=low
gtk+2.0 (2.8.7-1) experimental; urgency=low
* New upstream version.
* Security fixes:
- Add check to XPM reader to prevent integer overflow for specially crafted
number of colors (CVE-2005-3186) (Closes: #339431).
- Fix endless loop with specially crafted number of colors (CVE-2005-2975).
* debian/patches/001_fs_documents.patch:
- updated.
* debian/rules:
- fix confusing cp usage.
[ Loic Minier ]
* Drop xlibs-dev deps and build-deps.
[debian/control, debian/control.in]
-- Loic Minier <lool@dooz.org> Fri, 11 Nov 2005 15:32:09 +0100
-- Sebastien Bacher <seb128@debian.org> Wed, 16 Nov 2005 11:54:11 +0100
gtk+2.0 (2.8.3-1) experimental; urgency=low

10
debian/docs vendored
View File

@ -1,5 +1,5 @@
build-tree/gtk+-2.6.4/NEWS
build-tree/gtk+-2.6.4/README
build-tree/gtk+-2.6.4/ChangeLog.pre-1-0
build-tree/gtk+-2.6.4/ChangeLog.pre-1-2
build-tree/gtk+-2.6.4/ChangeLog.pre-2-0
build-tree/gtk+-2.8.7/NEWS
build-tree/gtk+-2.8.7/README
build-tree/gtk+-2.8.7/ChangeLog.pre-1-0
build-tree/gtk+-2.8.7/ChangeLog.pre-1-2
build-tree/gtk+-2.8.7/ChangeLog.pre-2-0

2
debian/gtk2.0-examples.examples vendored
View File

@ -1 +1 @@
build-tree/gtk+-2.6.4/examples/*
build-tree/gtk+-2.8.7/examples/*

38
debian/patches/001_fs_documents.patch vendored
View File

@ -1,15 +1,15 @@
diff -Nur gtk+-2.4.7/gtk.orig/gtkfilechooserdefault.c gtk+-2.4.7/gtk/gtkfilechooserdefault.c
--- gtk+-2.4.7/gtk.orig/gtkfilechooserdefault.c 2004-08-14 20:08:50.000000000 +0200
+++ gtk+-2.4.7/gtk/gtkfilechooserdefault.c 2004-08-15 01:00:18.000000000 +0200
@@ -130,6 +130,7 @@
GtkFileFilter *current_filter;
GSList *filters;
diff -Nur gtk+-2.8.7.orig/gtk/gtkfilechooserdefault.c gtk+-2.8.7/gtk/gtkfilechooserdefault.c
--- gtk+-2.8.7.orig/gtk/gtkfilechooserdefault.c 2005-11-11 20:50:21.000000000 +0100
+++ gtk+-2.8.7/gtk/gtkfilechooserdefault.c 2005-11-16 11:59:33.000000000 +0100
@@ -222,6 +222,7 @@
GtkTooltips *tooltips;
+ gboolean has_documents;
gboolean has_home;
gboolean has_desktop;
@@ -241,6 +242,7 @@
@@ -343,6 +344,7 @@
/* Interesting places in the shortcuts bar */
typedef enum {
@ -17,8 +17,8 @@ diff -Nur gtk+-2.4.7/gtk.orig/gtkfilechooserdefault.c gtk+-2.4.7/gtk/gtkfilechoo
SHORTCUTS_HOME,
SHORTCUTS_DESKTOP,
SHORTCUTS_VOLUMES,
@@ -1109,6 +1111,33 @@
gtk_file_path_free (path);
@@ -1476,6 +1478,33 @@
profile_end ("end", NULL);
}
+
@ -51,7 +51,7 @@ diff -Nur gtk+-2.4.7/gtk.orig/gtkfilechooserdefault.c gtk+-2.4.7/gtk/gtkfilechoo
/* Appends a list of GtkFilePath to the shortcuts model; returns how many were inserted */
static int
shortcuts_append_paths (GtkFileChooserDefault *impl,
@@ -1151,6 +1180,11 @@
@@ -1527,6 +1556,11 @@
n = 0;
@ -63,7 +63,7 @@ diff -Nur gtk+-2.4.7/gtk.orig/gtkfilechooserdefault.c gtk+-2.4.7/gtk/gtkfilechoo
if (where == SHORTCUTS_HOME)
goto out;
@@ -1477,6 +1511,7 @@
@@ -1875,6 +1909,7 @@
if (impl->file_system)
{
@ -71,19 +71,3 @@ diff -Nur gtk+-2.4.7/gtk.orig/gtkfilechooserdefault.c gtk+-2.4.7/gtk/gtkfilechoo
shortcuts_append_home (impl);
shortcuts_append_desktop (impl);
shortcuts_add_volumes (impl);
diff -Nur gtk+-2.4.7/gtk.orig/gtkfilechooserwidget.c gtk+-2.4.7/gtk/gtkfilechooserwidget.c
--- gtk+-2.4.7/gtk.orig/gtkfilechooserwidget.c 2004-03-16 01:04:46.000000000 +0100
+++ gtk+-2.4.7/gtk/gtkfilechooserwidget.c 2004-08-15 01:00:45.000000000 +0200
@@ -157,7 +157,11 @@
gtk_box_pack_start (GTK_BOX (object), priv->impl, TRUE, TRUE, 0);
gtk_widget_show (priv->impl);
- current_folder = g_get_current_dir ();
+ if(g_file_test(g_build_filename (g_get_home_dir (), "Documents", NULL), G_FILE_TEST_IS_DIR))
+ current_folder = g_build_filename (g_get_home_dir (), "Documents", NULL);
+ else
+ current_folder = g_get_current_dir ();
+
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (priv->impl), current_folder);
g_free (current_folder);

4
debian/rules vendored
View File

@ -186,10 +186,10 @@ install: install-static install-shared
done
# for -doc
cp -a $(BUILD_SHARED_DIR)/docs/faq/html debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-faq/
cp -a $(BUILD_SHARED_DIR)/docs/faq/html debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-faq
cp -a $(CURDIR)/debian/gtk-faq.devhelp debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-faq/
cp -a $(BUILD_SHARED_DIR)/docs/tutorial/html debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-tutorial/
cp -a $(BUILD_SHARED_DIR)/docs/tutorial/html debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-tutorial
cp $(CURDIR)/debian/gtk-tutorial.devhelp debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-tutorial/
cp -ar $(BUILD_SHARED_DIR)/docs/tutorial/images debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-tutorial/

2
debian/scripts/vars vendored
View File

@ -8,7 +8,7 @@
SOURCE_DIR=build-tree
# For a single pkg, this is the directory that is embedded in the tarball.
# For multiple pkgs, this is null.
TAR_DIR=gtk+-2.8.3
TAR_DIR=gtk+-2.8.7
# Where to place all the stamp files. This directory can be removed, and
# all the targets will then be rerun.
STAMP_DIR=debian/stampdir

2
debian/sources vendored
View File

@ -1 +1 @@
upstream tar ../gtk+-2.8.3.tar.gz
upstream tar ../gtk+-2.8.7.tar.gz

4
debian/update-gdkpixbuf-loaders vendored
View File

@ -2,8 +2,8 @@
set -e
TMPFILE=`mktemp /tmp/gtk+-2.6.4.XXXXXXXXXX`
defaultver=2.6.0
TMPFILE=`mktemp /tmp/gtk+-2.8.7.XXXXXXXXXX`
defaultver=2.8.0
if [ "x$1" != "x" ]; then
VERSION=`echo $1 | sed -e 's/-[A-Za-z0-9\.]*$//' -e 's/+[A-Za-z0-9\.]*$//'`

4
debian/update-gtk-immodules vendored
View File

@ -2,9 +2,9 @@
set -e
TMPFILE=`mktemp /tmp/gtk+-2.6.4.XXXXXXXXXX`
TMPFILE=`mktemp /tmp/gtk+-2.8.7.XXXXXXXXXX`
apiver=2.0
defaultver=2.6.0
defaultver=2.8.0
if [ "x$1" != "x" ]; then
VERSION=`echo $1 | sed -e 's/-[A-Za-z0-9\.]*$//' -e 's/+[A-Za-z0-9\.]*$//'`