From 9275f6a1aad193def34bdb718e07b056a88d9322 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Nov 13 2012 11:55:16 +0000 Subject: update multilib patch --- diff --git a/caribou-0.4.1-multilib.patch b/caribou-0.4.1-multilib.patch deleted file mode 100644 index 0f26401..0000000 --- a/caribou-0.4.1-multilib.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -urN caribou-0.4.1.old/bin/antler-keyboard.in caribou-0.4.1/bin/antler-keyboard.in ---- caribou-0.4.1.old/bin/antler-keyboard.in 2011-10-10 02:08:14.000000000 +0530 -+++ caribou-0.4.1/bin/antler-keyboard.in 2011-12-06 15:32:55.517736521 +0530 -@@ -18,6 +18,19 @@ - # along with this program; if not, write to the Free Software Foundation, - # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -+ARCH=$(uname -m) -+ -+case $ARCH in -+x86_64 | sparc64 | s390x | ppc64) -+LIB_DIR=/usr/lib64 -+SECONDARY_LIB_DIR=/usr/lib -+;; -+* ) -+LIB_DIR=/usr/lib -+SECONDARY_LIB_DIR=/usr/lib64 -+;; -+esac -+ - script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" - - prefix=@prefix@ -@@ -27,9 +40,9 @@ - then - datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")" - export PYTHONPATH="${prefix}/lib/python@PYTHON_VERSION@/site-packages:${prefix}/lib64/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" -- export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" -- export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" -- export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}" -+ export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" -+ export LD_LIBRARY_PATH="$LIB_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" -+ export XDG_DATA_DIRS="$LIB_DIR${datadir:+:$datadir}" - else - export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" - export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" -diff -urN caribou-0.4.1.old/bin/caribou.in caribou-0.4.1/bin/caribou.in ---- caribou-0.4.1.old/bin/caribou.in 2011-10-10 02:08:14.000000000 +0530 -+++ caribou-0.4.1/bin/caribou.in 2011-12-06 15:37:16.757085822 +0530 -@@ -24,6 +24,19 @@ - # along with this program; if not, write to the Free Software Foundation, - # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -+ARCH=$(uname -m) -+ -+case $ARCH in -+x86_64 | sparc64 | s390x | ppc64) -+LIB_DIR=/usr/lib64 -+SECONDARY_LIB_DIR=/usr/lib -+;; -+* ) -+LIB_DIR=/usr/lib -+SECONDARY_LIB_DIR=/usr/lib64 -+;; -+esac -+ - script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" - - prefix=@prefix@ -@@ -32,7 +45,7 @@ - if [ $script_dir == "@bindir@" ] - then - export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" -- export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" -+ export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" - else - export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" - export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" -diff -urN caribou-0.4.1.old/bin/caribou-preferences.in caribou-0.4.1/bin/caribou-preferences.in ---- caribou-0.4.1.old/bin/caribou-preferences.in 2011-10-10 02:08:14.000000000 +0530 -+++ caribou-0.4.1/bin/caribou-preferences.in 2011-12-06 15:37:44.754230253 +0530 -@@ -18,6 +18,19 @@ - # along with this program; if not, write to the Free Software Foundation, - # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -+ARCH=$(uname -m) -+ -+case $ARCH in -+x86_64 | sparc64 | s390x | ppc64) -+LIB_DIR=/usr/lib64 -+SECONDARY_LIB_DIR=/usr/lib -+;; -+* ) -+LIB_DIR=/usr/lib -+SECONDARY_LIB_DIR=/usr/lib64 -+;; -+esac -+ - script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" - - prefix=@prefix@ -@@ -27,8 +40,8 @@ - then - datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")" - export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" -- export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" -- export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}" -+ export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" -+ export LD_LIBRARY_PATH="$LIB_DIR${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}" - export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}" - else - export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" diff --git a/caribou-0.4.4.2-multilib.patch b/caribou-0.4.4.2-multilib.patch new file mode 100644 index 0000000..9b27937 --- /dev/null +++ b/caribou-0.4.4.2-multilib.patch @@ -0,0 +1,254 @@ +diff -urN caribou-0.4.4.2-old/bin/antler-keyboard.in caribou-0.4.4.2/bin/antler-keyboard.in +--- caribou-0.4.4.2-old/bin/antler-keyboard.in 2012-11-12 23:49:21.000000000 +0530 ++++ caribou-0.4.4.2/bin/antler-keyboard.in 2012-11-13 17:19:41.963705977 +0530 +@@ -18,6 +18,19 @@ + # along with this program; if not, write to the Free Software Foundation, + # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + ++ARCH=$(uname -m) ++ ++case $ARCH in ++x86_64 | sparc64 | s390x | ppc64) ++LIB_DIR=/usr/lib64 ++SECONDARY_LIB_DIR=/usr/lib ++;; ++* ) ++LIB_DIR=/usr/lib ++SECONDARY_LIB_DIR=/usr/lib64 ++;; ++esac ++ + script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" + + prefix=@prefix@ +@@ -27,9 +40,9 @@ + then + datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")" + export PYTHONPATH="${prefix}/lib/python@PYTHON_VERSION@/site-packages:${prefix}/lib64/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" +- export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" +- export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" +- export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}" ++ export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" ++ export LD_LIBRARY_PATH="$LIB_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" ++ export XDG_DATA_DIRS="$LIB_DIR${datadir:+:$datadir}" + else + export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" + export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" +diff -urN caribou-0.4.4.2-old/bin/antler-keyboard.in~ caribou-0.4.4.2/bin/antler-keyboard.in~ +--- caribou-0.4.4.2-old/bin/antler-keyboard.in~ 1970-01-01 05:30:00.000000000 +0530 ++++ caribou-0.4.4.2/bin/antler-keyboard.in~ 2012-11-12 23:49:21.000000000 +0530 +@@ -0,0 +1,42 @@ ++#!/bin/bash ++# ++# Antler - a Caribou keyboard implementation ++# ++# Copyright (C) 2011 Eitan Isaacson ++# ++# This program is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by the ++# Free Software Foundation; either version 2.1 of the License, or (at your ++# option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but WITHOUT ++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License ++# for more details. ++# ++# You should have received a copy of the GNU Lesser General Public License ++# along with this program; if not, write to the Free Software Foundation, ++# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ ++script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" ++ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++ ++if [ $script_dir = "@libexecdir@" ] ++then ++ datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")" ++ export PYTHONPATH="${prefix}/lib/python@PYTHON_VERSION@/site-packages:${prefix}/lib64/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" ++ export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" ++ export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" ++ export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}" ++else ++ export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" ++ export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" ++ export LD_LIBRARY_PATH="$(dirname $script_dir)/libcaribou/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" ++ export ANTLER_THEME_PATH="$(dirname $script_dir)/data" ++fi ++ ++@PYTHON@ -c " ++from caribou.antler.main import AntlerKeyboardService ++AntlerKeyboardService().run()" +diff -urN caribou-0.4.4.2-old/bin/caribou.in caribou-0.4.4.2/bin/caribou.in +--- caribou-0.4.4.2-old/bin/caribou.in 2012-11-12 23:49:21.000000000 +0530 ++++ caribou-0.4.4.2/bin/caribou.in 2012-11-13 17:20:35.308743165 +0530 +@@ -24,6 +24,19 @@ + # along with this program; if not, write to the Free Software Foundation, + # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + ++ARCH=$(uname -m) ++ ++case $ARCH in ++x86_64 | sparc64 | s390x | ppc64) ++LIB_DIR=/usr/lib64 ++SECONDARY_LIB_DIR=/usr/lib ++;; ++* ) ++LIB_DIR=/usr/lib ++SECONDARY_LIB_DIR=/usr/lib64 ++;; ++esac ++ + script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" + + prefix=@prefix@ +@@ -32,7 +45,7 @@ + if [ $script_dir = "@bindir@" ] + then + export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" +- export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" ++ export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" + else + export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" + export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" +diff -urN caribou-0.4.4.2-old/bin/caribou.in~ caribou-0.4.4.2/bin/caribou.in~ +--- caribou-0.4.4.2-old/bin/caribou.in~ 1970-01-01 05:30:00.000000000 +0530 ++++ caribou-0.4.4.2/bin/caribou.in~ 2012-11-12 23:49:21.000000000 +0530 +@@ -0,0 +1,41 @@ ++#!/bin/bash ++# ++# Caribou - text entry and UI navigation application ++# ++# Copyright (C) 2009 Adaptive Technology Resource Centre ++# * Contributor: Ben Konrath ++# Copyright (C) 2009 Eitan Isaacson ++# Copyright (C) 2009 Sun Microsystems, Inc. ++# * Contributor: Willie Walker ++# Copyright (C) 2009 Flavio Percoco ++# * Contributor: Flavio Percoco ++# ++# This program is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by the ++# Free Software Foundation; either version 2.1 of the License, or (at your ++# option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but WITHOUT ++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License ++# for more details. ++# ++# You should have received a copy of the GNU Lesser General Public License ++# along with this program; if not, write to the Free Software Foundation, ++# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ ++script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" ++ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++ ++if [ $script_dir = "@bindir@" ] ++then ++ export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" ++ export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" ++else ++ export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" ++ export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" ++fi ++ ++@PYTHON@ -c "from caribou.daemon.main import CaribouDaemon; CaribouDaemon().run()" +diff -urN caribou-0.4.4.2-old/bin/caribou-preferences.in caribou-0.4.4.2/bin/caribou-preferences.in +--- caribou-0.4.4.2-old/bin/caribou-preferences.in 2012-11-12 23:49:21.000000000 +0530 ++++ caribou-0.4.4.2/bin/caribou-preferences.in 2012-11-13 17:21:52.503794659 +0530 +@@ -18,6 +18,19 @@ + # along with this program; if not, write to the Free Software Foundation, + # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + ++ARCH=$(uname -m) ++ ++case $ARCH in ++x86_64 | sparc64 | s390x | ppc64) ++LIB_DIR=/usr/lib64 ++SECONDARY_LIB_DIR=/usr/lib ++;; ++* ) ++LIB_DIR=/usr/lib ++SECONDARY_LIB_DIR=/usr/lib64 ++;; ++esac ++ + script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" + + prefix=@prefix@ +@@ -27,8 +40,8 @@ + then + datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")" + export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" +- export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" +- export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}" ++ export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" ++ export LD_LIBRARY_PATH="$LIB_DIR${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}" + export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}" + else + export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" +diff -urN caribou-0.4.4.2-old/bin/caribou-preferences.in~ caribou-0.4.4.2/bin/caribou-preferences.in~ +--- caribou-0.4.4.2-old/bin/caribou-preferences.in~ 1970-01-01 05:30:00.000000000 +0530 ++++ caribou-0.4.4.2/bin/caribou-preferences.in~ 2012-11-12 23:49:21.000000000 +0530 +@@ -0,0 +1,57 @@ ++#!/bin/bash ++# ++# Antler - a Caribou keyboard implementation ++# ++# Copyright (C) 2011 Eitan Isaacson ++# ++# This program is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by the ++# Free Software Foundation; either version 2.1 of the License, or (at your ++# option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but WITHOUT ++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License ++# for more details. ++# ++# You should have received a copy of the GNU Lesser General Public License ++# along with this program; if not, write to the Free Software Foundation, ++# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ ++script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" ++ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++ ++if [ $script_dir = "@bindir@" ] ++then ++ datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")" ++ export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" ++ export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" ++ export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}" ++ export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}" ++else ++ export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" ++ export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" ++ export LD_LIBRARY_PATH="$(dirname $script_dir)/libcaribou/.lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" ++fi ++ ++@PYTHON@ -c " ++import signal ++signal.signal(signal.SIGINT, signal.SIG_DFL) ++ ++from caribou.settings.preferences_window import PreferencesWindow ++from caribou.settings import CaribouSettings ++from gi.repository import Gtk ++ ++w = PreferencesWindow(CaribouSettings()) ++ ++w.connect('delete-event', lambda x, y: Gtk.main_quit()) ++ ++w.show_all() ++ ++try: ++ Gtk.main() ++except KeyboardInterrupt: ++ Gtk.main_quit() ++"