I have made the following changes intended for : CE:Apps:MTF / meego-terminal
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/3756 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3756: Messages from BOSS: Could not notify CE-maintainers (no address found) State: review 2011-12-21T15:02:49 bossbot Reviews: accepted by bossbot : Prechecks completed; none failed. new by : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:CE:Apps:MTF / meego-terminal -> CE:Apps:MTF / meego-terminal changes files: -------------- --- meego-terminal.changes +++ meego-terminal.changes @@ -0,0 +1,6 @@ +* Wed Dec 21 2011 Marko Saukko <[email protected]> - 0.2.2-1 +- Update to version 0.2.2-1 +- Dropped Fix-AreaY-BMC19493.patch fixed in upstream. +- Added meego-terminal-0.2.2.1-add-missing-libs-for-linking.patch + to fix linking with newer toolchain. + old: ---- Fix-AreaY-BMC19493.patch meego-terminal-0.2.1.tar.bz2 new: ---- meego-terminal-0.2.2.1-add-missing-libs-for-linking.patch meego-terminal-meego-terminal-Release_0.2.2.1.tar.gz spec files: ----------- --- meego-terminal.spec +++ meego-terminal.spec @@ -7,14 +7,14 @@ Name: meego-terminal Summary: Terminal emulator for MeeGo -Version: 0.2.1 +Version: 0.2.2 Release: 1 Group: System/Libraries License: LGPL v2.1 -URL: http://meego.gitorious.org/meegotouch/libmeegotouch -Source0: %{name}-%{version}.tar.bz2 +URL: https://gitorious.org/meego-terminal/meego-terminal +Source0: meego-terminal-%{name}-Release_%{version}.1.tar.gz Source100: meego-terminal.yaml -Patch0: Fix-AreaY-BMC19493.patch +Patch0: meego-terminal-0.2.2.1-add-missing-libs-for-linking.patch BuildRequires: pkgconfig(QtCore) >= 4.6.0 BuildRequires: pkgconfig(meegotouch) BuildRequires: pkgconfig(x11) @@ -27,9 +27,9 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{name} -# Fix-AreaY-BMC19493.patch +# meego-terminal-0.2.2.1-add-missing-libs-for-linking.patch %patch0 -p1 # >> setup # << setup other changes: -------------- ++++++ meego-terminal-0.2.2.1-add-missing-libs-for-linking.patch (new) --- meego-terminal-0.2.2.1-add-missing-libs-for-linking.patch +++ meego-terminal-0.2.2.1-add-missing-libs-for-linking.patch @@ -0,0 +1,27 @@ +From bdb770933d745c923f4c833eddc49473329769d8 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Wed, 21 Dec 2011 16:56:59 +0200 +Subject: [PATCH] Fix linking with newer toolchains by adding the missing + libs. + +Signed-off-by: Marko Saukko <[email protected]> +--- + src_meegotouch/src_meegotouch.pro | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src_meegotouch/src_meegotouch.pro b/src_meegotouch/src_meegotouch.pro +index 3850d33..07ca1b8 100644 +--- a/src_meegotouch/src_meegotouch.pro ++++ b/src_meegotouch/src_meegotouch.pro +@@ -7,7 +7,7 @@ CONFIG += meegotouch + QT += core gui + + MOC_DIR = ../.moc +-LIBS += -L.. ++LIBS += -L.. -lX11 -lmeegotouchviews + + CONFIG(debug, debug|release) { + OBJECTS_DIR = ../.objs_d +-- +1.7.6.4 + ++++++ meego-terminal-meego-terminal-Release_0.2.2.1.tar.gz (new) ++++++ meego-terminal.yaml --- meego-terminal.yaml +++ meego-terminal.yaml @@ -1,14 +1,14 @@ Name: meego-terminal Summary: Terminal emulator for MeeGo -Version: 0.2.1 +Version: 0.2.2 Release: 1 Group: System/Libraries -License: LGPL v2.1 -URL: http://meego.gitorious.org/meegotouch/libmeegotouch +License: LGPL v2.1 +URL: https://gitorious.org/meego-terminal/meego-terminal Sources: - - "%{name}-%{version}.tar.bz2" + - "meego-terminal-%{name}-Release_%{version}.1.tar.gz" Patches: - - "Fix-AreaY-BMC19493.patch" + - meego-terminal-0.2.2.1-add-missing-libs-for-linking.patch Description: Terminal emulator for MeeGo. Configure: none Builder: qmake ++++++ deleted files: --- Fix-AreaY-BMC19493.patch --- meego-terminal-0.2.1.tar.bz2
