Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cd6a147ad6f44f33cfa98fd1987af01ee1188462

commit cd6a147ad6f44f33cfa98fd1987af01ee1188462
Author: crazy <cr...@frugalware.org>
Date:   Mon Mar 1 17:15:48 2010 +0100

gfpm-1.3.2-3-x86_64
* backport 2 fixes from git to fix UI and logviewer crashes
* closes #4122

diff --git a/source/xapps/gfpm/Fix_gtk.diff b/source/xapps/gfpm/Fix_gtk.diff
deleted file mode 100644
index 7368d1a..0000000
--- a/source/xapps/gfpm/Fix_gtk.diff
+++ /dev/null
@@ -1,117 +0,0 @@
---- gfpm-1.3.2/data/gfpm.ui    2009-09-05 17:42:44.000000000 +0200
-+++ gfpm-1.3.2/data/gfpm.ui    2009-09-11 17:35:52.000000000 +0200
-@@ -8,7 +8,7 @@
-     <property name="default_height">600</property>
-     <signal name="delete_event" handler="gtk_main_quit"/>
-     <child>
--      <object class="GtkVBox" id="vbox1">
-+      <object class="GtkVBox" id="vbox111">
-         <property name="visible">True</property>
-         <child>
-           <object class="GtkMenuBar" id="menubar1">
-@@ -48,7 +48,7 @@
-                         <property name="label" 
translatable="yes">Repositories</property>
-                         <property name="visible">True</property>
-                         <property name="tooltip_text" 
translatable="yes">Manage Repositories</property>
--                        <property name="image">image1</property>
-+                        <property name="image">image1111</property>
-                         <property name="use_stock">False</property>
-                       </object>
-                     </child>
-@@ -91,7 +91,7 @@
-                         <property name="label" translatable="yes">_Optimize 
package database</property>
-                         <property name="visible">True</property>
-                         <property name="use_underline">True</property>
--                        <property name="image">image3</property>
-+                        <property name="image">image3333</property>
-                         <property name="use_stock">False</property>
-                         <signal name="activate" handler="gtk_widget_show" 
object="optimize_db_dlg"/>
-                       </object>
-@@ -102,7 +102,7 @@
-                         <property name="visible">True</property>
-                         <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
-                         <property name="use_underline">True</property>
--                        <property name="image">image4</property>
-+                        <property name="image">image4444</property>
-                         <property name="use_stock">False</property>
-                       </object>
-                     </child>
-@@ -278,11 +278,11 @@
-                               </packing>
-                             </child>
-                             <child>
--                              <object class="GtkAlignment" id="alignment1">
-+                              <object class="GtkAlignment" id="alignment1111">
-                                 <property name="visible">True</property>
-                                 <property name="top_padding">5</property>
-                                 <child>
--                                  <object class="GtkVBox" id="vbox3">
-+                                  <object class="GtkVBox" id="vbox333">
-                                     <property name="visible">True</property>
-                                     <child>
-                                       <object class="GtkComboBox" 
id="combobox_repos">
-@@ -489,7 +489,7 @@
-                         <property name="left_padding">5</property>
-                         <property name="right_padding">5</property>
-                         <child>
--                          <object class="GtkScrolledWindow" 
id="scrolledwindow1">
-+                          <object class="GtkScrolledWindow" 
id="scrolledwindow1111">
-                             <property name="visible">True</property>
-                             <property name="can_focus">False</property>
-                             <property 
name="hscrollbar_policy">automatic</property>
-@@ -807,7 +807,7 @@
-                       </object>
-                     </child>
-                     <child type="label">
--                      <object class="GtkLabel" id="label1">
-+                      <object class="GtkLabel" id="label1111">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">&lt;b&gt;Information&lt;/b&gt;</property>
-                         <property name="use_markup">True</property>
-@@ -1307,14 +1307,14 @@
-             <property name="label_xalign">0</property>
-             <property name="shadow_type">none</property>
-             <child>
--              <object class="GtkAlignment" id="alignment1">
-+              <object class="GtkAlignment" id="alignment11111">
-                 <property name="visible">True</property>
-                 <property name="top_padding">6</property>
-                 <property name="bottom_padding">6</property>
-                 <property name="left_padding">6</property>
-                 <property name="right_padding">6</property>
-                 <child>
--                  <object class="GtkVBox" id="vbox1">
-+                  <object class="GtkVBox" id="vbox1111">
-                     <property name="visible">True</property>
-                     <property name="orientation">vertical</property>
-                     <child>
-@@ -3915,7 +3915,7 @@
-       </object>
-     </child>
-   </object>
--  <object class="GtkImage" id="image1">
-+  <object class="GtkImage" id="image1111">
-     <property name="visible">True</property>
-     <property name="icon_name">gfpm</property>
-   </object>
-@@ -3924,17 +3924,17 @@
-     <property name="stock">gtk-clear</property>
-     <property name="icon-size">1</property>
-   </object>
--  <object class="GtkImage" id="image3">
-+  <object class="GtkImage" id="image3333">
-     <property name="visible">True</property>
-     <property name="stock">gtk-refresh</property>
-     <property name="icon-size">1</property>
-   </object>
--  <object class="GtkImage" id="image4">
-+  <object class="GtkImage" id="image4444">
-     <property name="visible">True</property>
-     <property name="stock">gtk-dialog-info</property>
-     <property name="icon-size">1</property>
-   </object>
--  <object class="GtkImage" id="image5">
-+  <object class="GtkImage" id="image5555">
-     <property name="visible">True</property>
-     <property name="icon_name">gtk-clear</property>
-   </object>
diff --git a/source/xapps/gfpm/FrugalBuild b/source/xapps/gfpm/FrugalBuild
index cb3e347..97c8c8e 100644
--- a/source/xapps/gfpm/FrugalBuild
+++ b/source/xapps/gfpm/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gfpm
pkgver=1.3.2
-pkgrel=2
+pkgrel=3
pkgdesc="Graphical Frugalware Package Manager"
url="http://ftp.frugalware.org/pub/other/gfpm";
depends=('glib2' 'gtk+2>=2.16.4' 'pacman-g2>=3.7.3' 'frugalwareutils>=0.8.7')
@@ -19,8 +19,10 @@ subdepends=("$pkgname=$pkgver nautilus>=2.26.3-2" 
"$pkgname=$pkgver thunar>=1.0.
subgroups=('gnome' 'xfce4')
subarchs=('i686 x86_64' 'i686 x86_64')
up2date="lynx -dump $url | Flasttar"
-source=($url/$pkgname-$pkgver.tar.gz Fix_gtk.diff)
-signatures=(${source[0]}.asc '')
+source=($url/$pkgname-$pkgver.tar.gz \
+       fix-logviewer-crash-48897c4e5467c62cb36ab191eab6ce779f8714da.patch \
+       fix-UI-crash-d7bc09e6e64e81077901d42c6fffd932baff910e.patch)
+signatures=(${source[0]}.asc '' '')

build()
{
diff --git 
a/source/xapps/gfpm/fix-UI-crash-d7bc09e6e64e81077901d42c6fffd932baff910e.patch 
b/source/xapps/gfpm/fix-UI-crash-d7bc09e6e64e81077901d42c6fffd932baff910e.patch
new file mode 100644
index 0000000..2197c25
--- /dev/null
+++ 
b/source/xapps/gfpm/fix-UI-crash-d7bc09e6e64e81077901d42c6fffd932baff910e.patch
@@ -0,0 +1,110 @@
+From d7bc09e6e64e81077901d42c6fffd932baff910e Mon Sep 17 00:00:00 2001
+From: crazy <cr...@frugalware.org>
+Date: Sat, 20 Feb 2010 02:00:14 +0100
+Subject: [PATCH] gfpm.ui: fix crash bug(s) , patch from elentir
+
+---
+ data/gfpm.ui |   22 +++++++++++-----------
+ 1 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/data/gfpm.ui b/data/gfpm.ui
+index 389b14d..0f91468 100644
+--- a/data/gfpm.ui
++++ b/data/gfpm.ui
+@@ -680,7 +680,7 @@
+                                         <property 
name="visible">True</property>
+                                         <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                         <child>
+-                                          <object class="GtkImage" 
id="image5">
++                                          <object class="GtkImage" 
id="image_remove">
+                                             <property 
name="visible">True</property>
+                                             <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                             <property 
name="xalign">0</property>
+@@ -860,7 +860,7 @@
+       <object class="GtkVBox" id="vbox5">
+         <property name="visible">True</property>
+         <child>
+-          <object class="GtkImage" id="image1">
++          <object class="GtkImage" id="image_splash">
+             <property name="visible">True</property>
+             <property name="pixbuf">splash.png</property>
+           </object>
+@@ -1102,7 +1102,7 @@
+         <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+         <property name="spacing">5</property>
+         <child>
+-          <object class="GtkVBox" id="vbox3">
++          <object class="GtkVBox" id="vbox_cache">
+             <property name="visible">True</property>
+             <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+             <property name="spacing">8</property>
+@@ -1307,18 +1307,18 @@
+             <property name="label_xalign">0</property>
+             <property name="shadow_type">none</property>
+             <child>
+-              <object class="GtkAlignment" id="alignment1">
++              <object class="GtkAlignment" id="alignment_dlg_file_info">
+                 <property name="visible">True</property>
+                 <property name="top_padding">6</property>
+                 <property name="bottom_padding">6</property>
+                 <property name="left_padding">6</property>
+                 <property name="right_padding">6</property>
+                 <child>
+-                  <object class="GtkVBox" id="vbox1">
++                  <object class="GtkVBox" id="vbox_dlg_file_info">
+                     <property name="visible">True</property>
+                     <property name="orientation">vertical</property>
+                     <child>
+-                      <object class="GtkScrolledWindow" id="scrolledwindow1">
++                      <object class="GtkScrolledWindow" 
id="scrolledwindow_dlg_file_info">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property 
name="hscrollbar_policy">automatic</property>
+@@ -1341,7 +1341,7 @@
+               </object>
+             </child>
+             <child type="label">
+-              <object class="GtkLabel" id="label1">
++              <object class="GtkLabel" id="label_info">
+                 <property name="visible">True</property>
+                 <property name="label" 
translatable="yes">&lt;b&gt;Information&lt;/b&gt;</property>
+                 <property name="use_markup">True</property>
+@@ -1444,7 +1444,7 @@
+                     <property name="visible">True</property>
+                     <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+                     <child>
+-                      <object class="GtkImage" id="image3">
++                      <object class="GtkImage" id="image_apply">
+                         <property name="visible">True</property>
+                         <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+                         <property name="xpad">3</property>
+@@ -1898,7 +1898,7 @@
+             <property name="visible">True</property>
+             <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+             <child>
+-              <object class="GtkImage" id="image4">
++              <object class="GtkImage" id="image_info">
+                 <property name="visible">True</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+                 <property name="yalign">0</property>
+@@ -2397,7 +2397,7 @@
+                     <property name="visible">True</property>
+                     <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+                     <child>
+-                      <object class="GtkVBox" id="vbox1">
++                      <object class="GtkVBox" id="vbox_log">
+                         <property name="visible">True</property>
+                         <property name="orientation">vertical</property>
+                         <child>
+@@ -2455,7 +2455,7 @@
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkAlignment" id="alignment1">
++                          <object class="GtkAlignment" id="alignment_log">
+                             <property name="visible">True</property>
+                             <property name="bottom_padding">3</property>
+                             <property name="left_padding">5</property>
+--
+1.6.5.3
+
diff --git 
a/source/xapps/gfpm/fix-logviewer-crash-48897c4e5467c62cb36ab191eab6ce779f8714da.patch
 
b/source/xapps/gfpm/fix-logviewer-crash-48897c4e5467c62cb36ab191eab6ce779f8714da.patch
new file mode 100644
index 0000000..e5a65ec
--- /dev/null
+++ 
b/source/xapps/gfpm/fix-logviewer-crash-48897c4e5467c62cb36ab191eab6ce779f8714da.patch
@@ -0,0 +1,33 @@
+From 48897c4e5467c62cb36ab191eab6ce779f8714da Mon Sep 17 00:00:00 2001
+From: crazy <cr...@frugalware.org>
+Date: Sat, 20 Feb 2010 05:31:02 +0100
+Subject: [PATCH] gfpm-logviewer.c: fix segfault and actually make that work 
since it didn't
+
+---
+ src/gfpm-logviewer.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/gfpm-logviewer.c b/src/gfpm-logviewer.c
+index 591aafb..7672623 100644
+--- a/src/gfpm-logviewer.c
++++ b/src/gfpm-logviewer.c
+@@ -18,6 +18,8 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+
++
++
+ #include "gfpm-logviewer.h"
+ #include "gfpm-messages.h"
+ #include "gfpm-interface.h"
+@@ -43,6 +45,7 @@ typedef struct _LogViewItem
+ #define DMK_FILE "/share/gfpm/datemsk"
+
+ int getdate_err;
++struct tm *getdate(const char *string);
+
+ /* Log viewer widgets */
+ static GtkWidget *gfpm_logviewer_dlg;
+--
+1.6.5.3
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to