[arch-commits] Commit in scim/repos (10 files)
Gaetan Bisson
bisson at archlinux.org
Tue Sep 6 22:52:36 UTC 2011
Date: Tuesday, September 6, 2011 @ 18:52:36
Author: bisson
Revision: 137306
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
scim/repos/extra-i686/PKGBUILD
(from rev 137305, scim/trunk/PKGBUILD)
scim/repos/extra-i686/install
(from rev 137305, scim/trunk/install)
scim/repos/extra-x86_64/PKGBUILD
(from rev 137305, scim/trunk/PKGBUILD)
scim/repos/extra-x86_64/install
(from rev 137305, scim/trunk/install)
Deleted:
scim/repos/extra-i686/PKGBUILD
scim/repos/extra-i686/install
scim/repos/extra-i686/wtf.patch
scim/repos/extra-x86_64/PKGBUILD
scim/repos/extra-x86_64/install
scim/repos/extra-x86_64/wtf.patch
------------------------+
extra-i686/PKGBUILD | 83 ++++++++++++++++++++---------------------
extra-i686/install | 26 ++++++-------
extra-i686/wtf.patch | 93 -----------------------------------------------
extra-x86_64/PKGBUILD | 83 ++++++++++++++++++++---------------------
extra-x86_64/install | 26 ++++++-------
extra-x86_64/wtf.patch | 93 -----------------------------------------------
6 files changed, 106 insertions(+), 298 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-09-06 22:52:12 UTC (rev 137305)
+++ extra-i686/PKGBUILD 2011-09-06 22:52:36 UTC (rev 137306)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: Gan Lu <rhythm.gan at gmail.com>
-
-pkgname=scim
-pkgver=1.4.11
-pkgrel=1
-pkgdesc='Input method user interface and development platform'
-url='http://www.scim-im.org/projects/scim'
-license=('GPL')
-arch=('i686' 'x86_64')
-options=('!libtool')
-makedepends=('intltool')
-depends=('gtk2' 'libtool')
-backup=('etc/scim/config' 'etc/scim/global')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
- 'wtf.patch')
-sha1sums=('dd93094f62e5707db88d4f0e7ebd3392ae75b942'
- '14d2be6c8f9f4af6494c3e806d3cadef5803597a')
-
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../wtf.patch # revert broken commit 303
-
- ./bootstrap
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --disable-static \
- --with-gnu-ld \
- --with-x \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-}
Copied: scim/repos/extra-i686/PKGBUILD (from rev 137305, scim/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-06 22:52:36 UTC (rev 137306)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Gan Lu <rhythm.gan at gmail.com>
+
+pkgname=scim
+pkgver=1.4.11
+pkgrel=2
+pkgdesc='Input method user interface and development platform'
+url='http://www.scim-im.org/projects/scim'
+license=('GPL')
+arch=('i686' 'x86_64')
+options=('!libtool')
+makedepends=('intltool')
+depends=('gtk2' 'libtool')
+backup=('etc/scim/config' 'etc/scim/global')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('e202e42df52f5c9a88f6ae4d4ce04f94bc22e27c')
+
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./bootstrap
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-static \
+ --with-gnu-ld \
+ --with-x \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/install
===================================================================
--- extra-i686/install 2011-09-06 22:52:12 UTC (rev 137305)
+++ extra-i686/install 2011-09-06 22:52:36 UTC (rev 137306)
@@ -1,13 +0,0 @@
-post_install() {
- echo -n 'updating gtk.immodules... '
- /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
- echo 'done.'
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: scim/repos/extra-i686/install (from rev 137305, scim/trunk/install)
===================================================================
--- extra-i686/install (rev 0)
+++ extra-i686/install 2011-09-06 22:52:36 UTC (rev 137306)
@@ -0,0 +1,13 @@
+post_install() {
+ echo -n 'updating gtk.immodules... '
+ /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+ echo 'done.'
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-i686/wtf.patch
===================================================================
--- extra-i686/wtf.patch 2011-09-06 22:52:12 UTC (rev 137305)
+++ extra-i686/wtf.patch 2011-09-06 22:52:36 UTC (rev 137306)
@@ -1,93 +0,0 @@
-diff -aur old/extras/panel/scim_panel_gtk.cpp new/extras/panel/scim_panel_gtk.cpp
---- old/extras/panel/scim_panel_gtk.cpp 2011-08-04 13:21:29.000000000 -0700
-+++ new/extras/panel/scim_panel_gtk.cpp 2011-08-07 16:11:12.977663776 -0700
-@@ -479,12 +479,12 @@
-
- static bool _should_exit = false;
-
-+static bool _panel_is_on = false;
-
--static struct timeval _last_menu_deactivate_time = {0, 0};
-+static GThread *_panel_agent_thread = 0;
-+
-+static PanelAgent *_panel_agent = 0;
-
--// client repository
--static PropertyRepository _frontend_property_repository;
--static HelperPropertyRepository _helper_property_repository;
- static std::vector<String> _factory_menu_uuids;
-
- static std::list<String> _recent_factory_uuids;
-@@ -1187,16 +1187,16 @@
-
- GtkRequisition ws;
- gint pos_x, pos_y;
-+
-+ gtk_widget_size_request (_toolbar_window, &ws);
-+
-+ pos_x = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X),
- workarea_x + workarea_width - ws.width);
- pos_y = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_Y),
- workarea_y + workarea_height - ws.height);
- if (pos_x == -1 && pos_y == -1) {
- pos_x = workarea_x + workarea_width - ws.width;
- pos_y = workarea_y + workarea_height - ws.height;
-- workarea_y + workarea_height - ws.height);
-- if (pos_x == -1 && pos_y == -1) {
-- pos_x = workarea_x + workarea_width - ws.width;
-- pos_y = workarea_y + workarea_height - ws.height;
- }
-
- if (_toolbar_auto_snap) {
-@@ -1215,6 +1215,10 @@
- else if (pos_y < 0)
- pos_y = 0;
-
-+ if (_toolbar_window_x != pos_x || _toolbar_window_y != pos_y || force) {
-+ gtk_window_move (GTK_WINDOW (_toolbar_window), pos_x, pos_y);
-+ _toolbar_window_x = pos_x;
-+ _toolbar_window_y = pos_y;
- }
- }
-
-@@ -1227,9 +1231,9 @@
- #endif
- return gdk_screen_width ();
- }
-- return gdk_screen_get_width (_current_screen);
--#endif
-- return gdk_screen_width ();
-+
-+static int
-+ui_screen_height (void)
- {
- #if GDK_MULTIHEAD_SAFE
- if (_current_screen)
-@@ -1237,10 +1241,6 @@
- #endif
- return gdk_screen_height ();
- }
-- return gdk_screen_get_height (_current_screen);
--#endif
-- return gdk_screen_height ();
--}
-
- static void
- ui_get_workarea (int &x, int &y, int &width, int &height)
-@@ -1929,11 +1929,11 @@
- static gulong motion_handler;
- GdkCursor *cursor;
-
-- if (!_config.null () &&
-- (_toolbar_window_x != pos_x || _toolbar_window_y != pos_y)) {
-- _config->write (
-- SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X, pos_x);
-- _config->write (
-+ if (click_type == 0 && event->button <= 1) {
-+ if (_toolbar_window_draging)
-+ return FALSE;
-+
-+ // Connection pointer motion handler to this window.
- motion_handler = g_signal_connect (G_OBJECT (window), "motion-notify-event",
- G_CALLBACK (ui_toolbar_window_motion_cb),
- NULL);
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-09-06 22:52:12 UTC (rev 137305)
+++ extra-x86_64/PKGBUILD 2011-09-06 22:52:36 UTC (rev 137306)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: Gan Lu <rhythm.gan at gmail.com>
-
-pkgname=scim
-pkgver=1.4.11
-pkgrel=1
-pkgdesc='Input method user interface and development platform'
-url='http://www.scim-im.org/projects/scim'
-license=('GPL')
-arch=('i686' 'x86_64')
-options=('!libtool')
-makedepends=('intltool')
-depends=('gtk2' 'libtool')
-backup=('etc/scim/config' 'etc/scim/global')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
- 'wtf.patch')
-sha1sums=('dd93094f62e5707db88d4f0e7ebd3392ae75b942'
- '14d2be6c8f9f4af6494c3e806d3cadef5803597a')
-
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../wtf.patch # revert broken commit 303
-
- ./bootstrap
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --disable-static \
- --with-gnu-ld \
- --with-x \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-}
Copied: scim/repos/extra-x86_64/PKGBUILD (from rev 137305, scim/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-06 22:52:36 UTC (rev 137306)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Gan Lu <rhythm.gan at gmail.com>
+
+pkgname=scim
+pkgver=1.4.11
+pkgrel=2
+pkgdesc='Input method user interface and development platform'
+url='http://www.scim-im.org/projects/scim'
+license=('GPL')
+arch=('i686' 'x86_64')
+options=('!libtool')
+makedepends=('intltool')
+depends=('gtk2' 'libtool')
+backup=('etc/scim/config' 'etc/scim/global')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('e202e42df52f5c9a88f6ae4d4ce04f94bc22e27c')
+
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./bootstrap
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-static \
+ --with-gnu-ld \
+ --with-x \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install 2011-09-06 22:52:12 UTC (rev 137305)
+++ extra-x86_64/install 2011-09-06 22:52:36 UTC (rev 137306)
@@ -1,13 +0,0 @@
-post_install() {
- echo -n 'updating gtk.immodules... '
- /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
- echo 'done.'
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: scim/repos/extra-x86_64/install (from rev 137305, scim/trunk/install)
===================================================================
--- extra-x86_64/install (rev 0)
+++ extra-x86_64/install 2011-09-06 22:52:36 UTC (rev 137306)
@@ -0,0 +1,13 @@
+post_install() {
+ echo -n 'updating gtk.immodules... '
+ /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+ echo 'done.'
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/wtf.patch
===================================================================
--- extra-x86_64/wtf.patch 2011-09-06 22:52:12 UTC (rev 137305)
+++ extra-x86_64/wtf.patch 2011-09-06 22:52:36 UTC (rev 137306)
@@ -1,93 +0,0 @@
-diff -aur old/extras/panel/scim_panel_gtk.cpp new/extras/panel/scim_panel_gtk.cpp
---- old/extras/panel/scim_panel_gtk.cpp 2011-08-04 13:21:29.000000000 -0700
-+++ new/extras/panel/scim_panel_gtk.cpp 2011-08-07 16:11:12.977663776 -0700
-@@ -479,12 +479,12 @@
-
- static bool _should_exit = false;
-
-+static bool _panel_is_on = false;
-
--static struct timeval _last_menu_deactivate_time = {0, 0};
-+static GThread *_panel_agent_thread = 0;
-+
-+static PanelAgent *_panel_agent = 0;
-
--// client repository
--static PropertyRepository _frontend_property_repository;
--static HelperPropertyRepository _helper_property_repository;
- static std::vector<String> _factory_menu_uuids;
-
- static std::list<String> _recent_factory_uuids;
-@@ -1187,16 +1187,16 @@
-
- GtkRequisition ws;
- gint pos_x, pos_y;
-+
-+ gtk_widget_size_request (_toolbar_window, &ws);
-+
-+ pos_x = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X),
- workarea_x + workarea_width - ws.width);
- pos_y = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_Y),
- workarea_y + workarea_height - ws.height);
- if (pos_x == -1 && pos_y == -1) {
- pos_x = workarea_x + workarea_width - ws.width;
- pos_y = workarea_y + workarea_height - ws.height;
-- workarea_y + workarea_height - ws.height);
-- if (pos_x == -1 && pos_y == -1) {
-- pos_x = workarea_x + workarea_width - ws.width;
-- pos_y = workarea_y + workarea_height - ws.height;
- }
-
- if (_toolbar_auto_snap) {
-@@ -1215,6 +1215,10 @@
- else if (pos_y < 0)
- pos_y = 0;
-
-+ if (_toolbar_window_x != pos_x || _toolbar_window_y != pos_y || force) {
-+ gtk_window_move (GTK_WINDOW (_toolbar_window), pos_x, pos_y);
-+ _toolbar_window_x = pos_x;
-+ _toolbar_window_y = pos_y;
- }
- }
-
-@@ -1227,9 +1231,9 @@
- #endif
- return gdk_screen_width ();
- }
-- return gdk_screen_get_width (_current_screen);
--#endif
-- return gdk_screen_width ();
-+
-+static int
-+ui_screen_height (void)
- {
- #if GDK_MULTIHEAD_SAFE
- if (_current_screen)
-@@ -1237,10 +1241,6 @@
- #endif
- return gdk_screen_height ();
- }
-- return gdk_screen_get_height (_current_screen);
--#endif
-- return gdk_screen_height ();
--}
-
- static void
- ui_get_workarea (int &x, int &y, int &width, int &height)
-@@ -1929,11 +1929,11 @@
- static gulong motion_handler;
- GdkCursor *cursor;
-
-- if (!_config.null () &&
-- (_toolbar_window_x != pos_x || _toolbar_window_y != pos_y)) {
-- _config->write (
-- SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X, pos_x);
-- _config->write (
-+ if (click_type == 0 && event->button <= 1) {
-+ if (_toolbar_window_draging)
-+ return FALSE;
-+
-+ // Connection pointer motion handler to this window.
- motion_handler = g_signal_connect (G_OBJECT (window), "motion-notify-event",
- G_CALLBACK (ui_toolbar_window_motion_cb),
- NULL);
More information about the arch-commits
mailing list