From 77a48ccdf967335d6757512167035f12ac36632957524065181747a33f204596 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 13 Oct 2009 08:27:21 +0000 Subject: [PATCH 1/5] Accepting request 22314 from home:michal-m:branches:editors Copy from home:michal-m:branches:editors/vim via accept of submit request 22314 revision 2. Request was accepted with message: Thanks for the submission OBS-URL: https://build.opensuse.org/request/show/22314 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=5 --- vim-7.2-patches.bz2 | 4 ++-- vim.changes | 7 +++++++ vim.spec | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/vim-7.2-patches.bz2 b/vim-7.2-patches.bz2 index cd678a7..844a0e4 100644 --- a/vim-7.2-patches.bz2 +++ b/vim-7.2-patches.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cddca138dfc10dae0ba69cd1ae99ac975e5ad8f50e4a7812cc000c5cc74ef485 -size 109150 +oid sha256:e7dc849318f0d490617f89f6cd23f1297bf8b07c4e7663a1c22c14b529e4afce +size 317123 diff --git a/vim.changes b/vim.changes index d37b9da..bc44067 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 12 17:04:41 CEST 2009 - mmarek@suse.cz + +- update to 7.2.267 + * removes assertion warnings in gvim (bnc#536535) + many other + fixes + ------------------------------------------------------------------- Mon Sep 28 15:32:01 CEST 2009 - werner@suse.de diff --git a/vim.spec b/vim.spec index 430e6cc..5dd7566 100644 --- a/vim.spec +++ b/vim.spec @@ -29,7 +29,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: db-devel fdupes gettext-devel gpm gtk2-devel libacl-devel ncurses-devel perl python-devel ruby-devel tcl-devel update-alternatives update-desktop-files # %define pkg_version 7.2 -%define official_ptchlvl 127 +%define official_ptchlvl 267 %define VIM_SUBDIR vim72 %define site_runtimepath /usr/share/vim/site # From 94fb6c7159237d91f272606ebbe69857c15740c022c0308c9ba1b1ec794c1fd2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 13 Oct 2009 10:11:19 +0000 Subject: [PATCH 2/5] Accepting request 22320 from home:michal-m:branches:editors Copy from home:michal-m:branches:editors/vim via accept of submit request 22320 revision 2. Request was accepted with message: Thanks for this fix OBS-URL: https://build.opensuse.org/request/show/22320 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=6 --- 7.2.257 | 61 +++++++++++++++++++++++++++++++++++++++++++++ vim-7.2-patches.bz2 | 4 +-- vim.changes | 6 ++--- vim.spec | 4 ++- 4 files changed, 68 insertions(+), 7 deletions(-) create mode 100644 7.2.257 diff --git a/7.2.257 b/7.2.257 new file mode 100644 index 0000000..f791a24 --- /dev/null +++ b/7.2.257 @@ -0,0 +1,61 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.257 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.257 +Problem: With GTK 2.17 lots of assertion error messages. +Solution: Remove check for static gravity. (Sebastian Droege) +Files: src/gui_gtk_f.c + + +*** ../vim-7.2.256/src/gui_gtk_f.c 2009-05-17 23:25:16.000000000 +0200 +--- src/gui_gtk_f.c 2009-09-11 15:15:41.000000000 +0200 +*************** +*** 860,870 **** + gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static) + { + #ifdef HAVE_GTK2 +! gboolean static_gravity_supported; +! +! static_gravity_supported = gdk_window_set_static_gravities(window, +! use_static); +! g_return_if_fail(static_gravity_supported); + #else + XSetWindowAttributes xattributes; + +--- 860,868 ---- + gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static) + { + #ifdef HAVE_GTK2 +! /* We don't check if static gravity is actually supported, because it +! * results in an annoying assertion error message. */ +! gdk_window_set_static_gravities(window, use_static); + #else + XSetWindowAttributes xattributes; + +*** ../vim-7.2.256/src/version.c 2009-09-11 15:46:20.000000000 +0200 +--- src/version.c 2009-09-11 16:16:52.000000000 +0200 +*************** +*** 678,679 **** +--- 678,681 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 257, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner + in the front doorway permanently so it always looks like you are + actually attempting to do something about that mess that has amassed + since you discovered the Internet. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ download, build and distribute -- http://www.A-A-P.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/vim-7.2-patches.bz2 b/vim-7.2-patches.bz2 index 844a0e4..cd678a7 100644 --- a/vim-7.2-patches.bz2 +++ b/vim-7.2-patches.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7dc849318f0d490617f89f6cd23f1297bf8b07c4e7663a1c22c14b529e4afce -size 317123 +oid sha256:cddca138dfc10dae0ba69cd1ae99ac975e5ad8f50e4a7812cc000c5cc74ef485 +size 109150 diff --git a/vim.changes b/vim.changes index bc44067..bbdb4c1 100644 --- a/vim.changes +++ b/vim.changes @@ -1,9 +1,7 @@ ------------------------------------------------------------------- -Mon Oct 12 17:04:41 CEST 2009 - mmarek@suse.cz +Tue Oct 13 12:04:46 CEST 2009 - mmarek@suse.cz -- update to 7.2.267 - * removes assertion warnings in gvim (bnc#536535) + many other - fixes +- add patch 7.2.257 to hide gtk assertions (bnc#536535). ------------------------------------------------------------------- Mon Sep 28 15:32:01 CEST 2009 - werner@suse.de diff --git a/vim.spec b/vim.spec index 5dd7566..aba4837 100644 --- a/vim.spec +++ b/vim.spec @@ -29,7 +29,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: db-devel fdupes gettext-devel gpm gtk2-devel libacl-devel ncurses-devel perl python-devel ruby-devel tcl-devel update-alternatives update-desktop-files # %define pkg_version 7.2 -%define official_ptchlvl 267 +%define official_ptchlvl 127 %define VIM_SUBDIR vim72 %define site_runtimepath /usr/share/vim/site # @@ -96,6 +96,7 @@ Patch22: vim-7.1-remove-terrible-hack.patch Patch23: vim-7.2-php.patch Patch24: vim-7.2-lib64.patch Patch25: vim-7.2-lzma-support.patch +Patch26: 7.2.257 Patch100: vim-7.1.314-CVE-2009-0316-debian.patch # tbd??? %name-6.3-ga-utf8.diff # tbd??? %name-6.3-initvals.diff @@ -313,6 +314,7 @@ unset p %patch23 %patch24 %patch25 +%patch26 %patch100 -p1 cp %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{S:10} . rename no nb $RPM_BUILD_DIR/vim*/src/po/no.* From 4bf54777c2c295e91289985dc70fc7921d00af145c03cb3910c7ab916dcb5e73 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 13 Oct 2009 10:24:19 +0000 Subject: [PATCH 3/5] Patch tagging OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=7 --- 7.2.257 => vim-7.2.257.patch | 0 vim.changes | 2 +- vim.spec | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) rename 7.2.257 => vim-7.2.257.patch (100%) diff --git a/7.2.257 b/vim-7.2.257.patch similarity index 100% rename from 7.2.257 rename to vim-7.2.257.patch diff --git a/vim.changes b/vim.changes index bbdb4c1..9d438a8 100644 --- a/vim.changes +++ b/vim.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Oct 13 12:04:46 CEST 2009 - mmarek@suse.cz -- add patch 7.2.257 to hide gtk assertions (bnc#536535). +- add patch vim-7.2.257.patch to hide gtk assertions (bnc#536535). ------------------------------------------------------------------- Mon Sep 28 15:32:01 CEST 2009 - werner@suse.de diff --git a/vim.spec b/vim.spec index aba4837..e75c6cf 100644 --- a/vim.spec +++ b/vim.spec @@ -96,7 +96,8 @@ Patch22: vim-7.1-remove-terrible-hack.patch Patch23: vim-7.2-php.patch Patch24: vim-7.2-lib64.patch Patch25: vim-7.2-lzma-support.patch -Patch26: 7.2.257 +# PATCH-FIX-UPSTREAM vim-7.2.257.patch bnc#536535 mmarek@novell.com -- Hide gtk assertions. +Patch26: vim-7.2.257.patch Patch100: vim-7.1.314-CVE-2009-0316-debian.patch # tbd??? %name-6.3-ga-utf8.diff # tbd??? %name-6.3-initvals.diff From f60b6a84f96e3e26a79b57cc06b95621a184e7360d021b58930cea20c554f703 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 13 Oct 2009 15:23:15 +0000 Subject: [PATCH 4/5] checked in OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=8 --- vim-7.2.257.patch | 61 ----------------------------------------------- vim.changes | 5 ---- vim.spec | 3 --- 3 files changed, 69 deletions(-) delete mode 100644 vim-7.2.257.patch diff --git a/vim-7.2.257.patch b/vim-7.2.257.patch deleted file mode 100644 index f791a24..0000000 --- a/vim-7.2.257.patch +++ /dev/null @@ -1,61 +0,0 @@ -To: vim-dev@vim.org -Subject: Patch 7.2.257 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.2.257 -Problem: With GTK 2.17 lots of assertion error messages. -Solution: Remove check for static gravity. (Sebastian Droege) -Files: src/gui_gtk_f.c - - -*** ../vim-7.2.256/src/gui_gtk_f.c 2009-05-17 23:25:16.000000000 +0200 ---- src/gui_gtk_f.c 2009-09-11 15:15:41.000000000 +0200 -*************** -*** 860,870 **** - gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static) - { - #ifdef HAVE_GTK2 -! gboolean static_gravity_supported; -! -! static_gravity_supported = gdk_window_set_static_gravities(window, -! use_static); -! g_return_if_fail(static_gravity_supported); - #else - XSetWindowAttributes xattributes; - ---- 860,868 ---- - gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static) - { - #ifdef HAVE_GTK2 -! /* We don't check if static gravity is actually supported, because it -! * results in an annoying assertion error message. */ -! gdk_window_set_static_gravities(window, use_static); - #else - XSetWindowAttributes xattributes; - -*** ../vim-7.2.256/src/version.c 2009-09-11 15:46:20.000000000 +0200 ---- src/version.c 2009-09-11 16:16:52.000000000 +0200 -*************** -*** 678,679 **** ---- 678,681 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 257, - /**/ - --- -hundred-and-one symptoms of being an internet addict: -231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner - in the front doorway permanently so it always looks like you are - actually attempting to do something about that mess that has amassed - since you discovered the Internet. - - /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/vim.changes b/vim.changes index 9d438a8..d37b9da 100644 --- a/vim.changes +++ b/vim.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Oct 13 12:04:46 CEST 2009 - mmarek@suse.cz - -- add patch vim-7.2.257.patch to hide gtk assertions (bnc#536535). - ------------------------------------------------------------------- Mon Sep 28 15:32:01 CEST 2009 - werner@suse.de diff --git a/vim.spec b/vim.spec index e75c6cf..430e6cc 100644 --- a/vim.spec +++ b/vim.spec @@ -96,8 +96,6 @@ Patch22: vim-7.1-remove-terrible-hack.patch Patch23: vim-7.2-php.patch Patch24: vim-7.2-lib64.patch Patch25: vim-7.2-lzma-support.patch -# PATCH-FIX-UPSTREAM vim-7.2.257.patch bnc#536535 mmarek@novell.com -- Hide gtk assertions. -Patch26: vim-7.2.257.patch Patch100: vim-7.1.314-CVE-2009-0316-debian.patch # tbd??? %name-6.3-ga-utf8.diff # tbd??? %name-6.3-initvals.diff @@ -315,7 +313,6 @@ unset p %patch23 %patch24 %patch25 -%patch26 %patch100 -p1 cp %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{S:10} . rename no nb $RPM_BUILD_DIR/vim*/src/po/no.* From 6f2a07609f4af9b01197b954159f8fdd2686615d01650c2d2c574917e14d89fe Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 13 Oct 2009 15:23:17 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/vim revision 38.0 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=ae23c64a975121af564b14ba0ed028eb --- vim-7.2.257.patch | 61 +++++++++++++++++++++++++++++++++++++++++++++++ vim.changes | 5 ++++ vim.spec | 13 ++++++---- 3 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 vim-7.2.257.patch diff --git a/vim-7.2.257.patch b/vim-7.2.257.patch new file mode 100644 index 0000000..f791a24 --- /dev/null +++ b/vim-7.2.257.patch @@ -0,0 +1,61 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.257 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.257 +Problem: With GTK 2.17 lots of assertion error messages. +Solution: Remove check for static gravity. (Sebastian Droege) +Files: src/gui_gtk_f.c + + +*** ../vim-7.2.256/src/gui_gtk_f.c 2009-05-17 23:25:16.000000000 +0200 +--- src/gui_gtk_f.c 2009-09-11 15:15:41.000000000 +0200 +*************** +*** 860,870 **** + gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static) + { + #ifdef HAVE_GTK2 +! gboolean static_gravity_supported; +! +! static_gravity_supported = gdk_window_set_static_gravities(window, +! use_static); +! g_return_if_fail(static_gravity_supported); + #else + XSetWindowAttributes xattributes; + +--- 860,868 ---- + gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static) + { + #ifdef HAVE_GTK2 +! /* We don't check if static gravity is actually supported, because it +! * results in an annoying assertion error message. */ +! gdk_window_set_static_gravities(window, use_static); + #else + XSetWindowAttributes xattributes; + +*** ../vim-7.2.256/src/version.c 2009-09-11 15:46:20.000000000 +0200 +--- src/version.c 2009-09-11 16:16:52.000000000 +0200 +*************** +*** 678,679 **** +--- 678,681 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 257, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner + in the front doorway permanently so it always looks like you are + actually attempting to do something about that mess that has amassed + since you discovered the Internet. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ download, build and distribute -- http://www.A-A-P.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/vim.changes b/vim.changes index d37b9da..9d438a8 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 13 12:04:46 CEST 2009 - mmarek@suse.cz + +- add patch vim-7.2.257.patch to hide gtk assertions (bnc#536535). + ------------------------------------------------------------------- Mon Sep 28 15:32:01 CEST 2009 - werner@suse.de diff --git a/vim.spec b/vim.spec index 430e6cc..972a1e8 100644 --- a/vim.spec +++ b/vim.spec @@ -20,9 +20,9 @@ Name: vim Version: 7.2 -Release: 14 +Release: 15 # -License: Other uncritical OpenSource License ; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license +License: Other uncritical OpenSource License ; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -96,6 +96,8 @@ Patch22: vim-7.1-remove-terrible-hack.patch Patch23: vim-7.2-php.patch Patch24: vim-7.2-lib64.patch Patch25: vim-7.2-lzma-support.patch +# PATCH-FIX-UPSTREAM vim-7.2.257.patch bnc#536535 mmarek@novell.com -- Hide gtk assertions. +Patch26: vim-7.2.257.patch Patch100: vim-7.1.314-CVE-2009-0316-debian.patch # tbd??? %name-6.3-ga-utf8.diff # tbd??? %name-6.3-initvals.diff @@ -124,7 +126,7 @@ Authors: Bram Moolenaar %package data -License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license +License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi PreReq: %{vim_prereq} # @@ -151,7 +153,7 @@ Authors: Bram Moolenaar %package base -License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license +License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi PreReq: %{vim_prereq} PreReq: update-alternatives @@ -253,7 +255,7 @@ Authors: %endif %package -n gvim -License: Other uncritical OpenSource License ; Charityware. If you wish please donate to Uganda +License: Other uncritical OpenSource License ; Charityware. If you wish please donate to Uganda Group: Productivity/Editors/Vi PreReq: %{gvim_prereq} PreReq: update-alternatives @@ -313,6 +315,7 @@ unset p %patch23 %patch24 %patch25 +%patch26 %patch100 -p1 cp %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{S:10} . rename no nb $RPM_BUILD_DIR/vim*/src/po/no.*