rpms/scim/devel .cvsignore, 1.22, 1.23 scim-1.4.5-panel-menu-fixes.patch, 1.2, 1.3 scim.spec, 1.87, 1.88 scim_panel_gtk-icon-size-fixes.patch, 1.5, 1.6 sources, 1.23, 1.24
Jens Petersen (petersen)
fedora-extras-commits at redhat.com
Mon May 21 02:42:06 UTC 2007
Author: petersen
Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13283
Modified Files:
.cvsignore scim-1.4.5-panel-menu-fixes.patch scim.spec
scim_panel_gtk-icon-size-fixes.patch sources
Log Message:
- update to 1.4.6 release
- scim_panel-observe-workarea-xprop-204442.patch and
scim_x11_frontend-ic-focus-LTC27940-215953.patch are no longer needed
- update scim-1.4.5-panel-menu-fixes.patch and
scim_panel_gtk-icon-size-fixes.patch
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 13 Feb 2007 06:58:35 -0000 1.22
+++ .cvsignore 21 May 2007 02:41:31 -0000 1.23
@@ -1,2 +1,2 @@
-scim-1.4.5.tar.gz
scim-icons-0.7.tar.gz
+scim-1.4.6.tar.gz
scim-1.4.5-panel-menu-fixes.patch:
Index: scim-1.4.5-panel-menu-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim-1.4.5-panel-menu-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-1.4.5-panel-menu-fixes.patch 15 Dec 2006 08:36:36 -0000 1.2
+++ scim-1.4.5-panel-menu-fixes.patch 21 May 2007 02:41:31 -0000 1.3
@@ -1,15 +1,6 @@
diff -u scim-1.4.5/extras/panel/scim_panel_gtk.cpp.11-factory-menu scim-1.4.5/extras/panel/scim_panel_gtk.cpp
--- scim-1.4.5/extras/panel/scim_panel_gtk.cpp.11-factory-menu 2006-12-15 17:33:53.000000000 +1000
+++ scim-1.4.5/extras/panel/scim_panel_gtk.cpp 2006-12-15 17:33:53.000000000 +1000
-@@ -193,7 +193,7 @@
- static GtkWidget* ui_create_left_icon (void);
- static GtkWidget* ui_create_right_icon (void);
-
--static GtkWidget* ui_create_factory_menu_entry (const PanelFactoryInfo &info,
-+static void ui_create_factory_menu_entry (const PanelFactoryInfo &info,
- int id,
- GtkMenuShell *menu,
- bool show_lang,
@@ -720,7 +720,6 @@
GtkWidget *lookup_table_parent;
GtkWidget *image;
@@ -18,15 +9,6 @@
if (_lookup_table_embedded) {
_lookup_table_window = gtk_vbox_new (FALSE, 0);
-@@ -1517,7 +1516,7 @@
- LOOKUP_ICON_SIZE);
- }
-
--static GtkWidget*
-+static void
- ui_create_factory_menu_entry (const PanelFactoryInfo &info,
- gint id,
- GtkMenuShell *menu,
@@ -1529,12 +1528,12 @@
GtkWidget *icon_image;
String text, tooltip;
Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- scim.spec 4 May 2007 08:52:14 -0000 1.87
+++ scim.spec 21 May 2007 02:41:31 -0000 1.88
@@ -2,8 +2,8 @@
%define snapshot 0%{?snapdate:1}
Name: scim
-Version: 1.4.5
-Release: 18%{?dist}
+Version: 1.4.6
+Release: 1%{?dist}
Summary: Smart Common Input Method platform
License: LGPL
@@ -36,8 +36,6 @@
Patch9: scim_panel_gtk-icon-size-fixes.patch
Patch11: scim-1.4.5-panel-menu-fixes.patch
Patch12: scim-fix-unload-segfault.patch
-Patch13: scim_panel-observe-workarea-xprop-204442.patch
-Patch14: scim_x11_frontend-ic-focus-LTC27940-215953.patch
Patch15: scim-gtkimm-default-snooper-off-213796.patch
Patch16: scim_panel_gtk-settle-toolbar-after-drag.patch
Patch17: scim-1.4.5-no-rpath-libdir.patch
@@ -103,8 +101,6 @@
%patch9 -p1 -b .9-icon-size~
%patch11 -p1 -b .11-factory-menu~
%patch12 -p1 -b .12-unloadsegfault~
-%patch13 -p1 -b .13-workarea-xprop~
-%patch14 -p1 -b .14-xim-focus~
%patch15 -p1 -b .15-key-snooper~
%patch16 -p1 -b .16-drag-move~
%patch17 -p1 -b .17-rpath~
@@ -242,9 +238,16 @@
%changelog
+* Mon May 21 2007 Jens Petersen <petersen at redhat.com> - 1.4.6-1
+- update to 1.4.6 release
+ - scim_panel-observe-workarea-xprop-204442.patch and
+ scim_x11_frontend-ic-focus-LTC27940-215953.patch are no longer needed
+ - update scim-1.4.5-panel-menu-fixes.patch and
+ scim_panel_gtk-icon-size-fixes.patch
+
* Fri May 4 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-18
-- completely remove scim-setup.desktop to stop "Applications -> Other"
- appearing (#238966)
+- completely remove scim-setup.desktop to stop it appearing in
+ "Applications -> Other" (#238966)
* Wed May 2 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-17
- remove scim-setup from the desktop preferences menu since it is confusing
scim_panel_gtk-icon-size-fixes.patch:
Index: scim_panel_gtk-icon-size-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim_panel_gtk-icon-size-fixes.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scim_panel_gtk-icon-size-fixes.patch 17 Nov 2006 09:33:35 -0000 1.5
+++ scim_panel_gtk-icon-size-fixes.patch 21 May 2007 02:41:31 -0000 1.6
@@ -4,7 +4,7 @@
#define SCIM_PIN_DOWN_ICON_FILE (SCIM_ICONDIR "/pin-down.png")
#define TOOLBAR_ICON_SIZE 16
--#define TRAY_ICON_SIZE 16
+-#define TRAY_ICON_SIZE 18
+#define TRAY_ICON_SIZE 11
#define LOOKUP_ICON_SIZE 12
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 13 Feb 2007 06:58:35 -0000 1.23
+++ sources 21 May 2007 02:41:31 -0000 1.24
@@ -1,2 +1,2 @@
-e2c71f9f54eda65cc1a515863a1839d2 scim-1.4.5.tar.gz
+4fc993c59a2dd7c8b9d9f240697d5b3b scim-1.4.6.tar.gz
2308b7fc4a5f981d08c7f00c90a7291b scim-icons-0.7.tar.gz
More information about the fedora-extras-commits
mailing list