SF.net SVN: gar:[22455] csw/mgar/pkg/inkscape/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Fri Nov 8 21:13:58 CET 2013
Revision: 22455
http://gar.svn.sourceforge.net/gar/?rev=22455&view=rev
Author: guengel
Date: 2013-11-08 20:13:58 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
inkscape/trunk: Build is now fine, linking still fails.
Modified Paths:
--------------
csw/mgar/pkg/inkscape/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/inkscape/trunk/files/0000-desktop-widget.cpp-resolve-overload-ambiguity.patch
csw/mgar/pkg/inkscape/trunk/files/0000-ruler.cpp-resolved-overload-ambiguity.patch
csw/mgar/pkg/inkscape/trunk/files/0000-tile.cpp-resolved-overload-ambiguity.patch
Modified: csw/mgar/pkg/inkscape/trunk/Makefile
===================================================================
--- csw/mgar/pkg/inkscape/trunk/Makefile 2013-11-08 17:36:05 UTC (rev 22454)
+++ csw/mgar/pkg/inkscape/trunk/Makefile 2013-11-08 20:13:58 UTC (rev 22455)
@@ -19,6 +19,9 @@
PATCHFILES += 0000-lpe-lattice.cpp-resolve-overload-ambiguity.patch
PATCHFILES += 0000-round.cpp-resolve-overload-ambiguity.patch
PATCHFILES += 0000-svg-length.cpp-resolve-overload-ambiguity.patch
+PATCHFILES += 0000-desktop-widget.cpp-resolve-overload-ambiguity.patch
+PATCHFILES += 0000-ruler.cpp-resolved-overload-ambiguity.patch
+PATCHFILES += 0000-tile.cpp-resolved-overload-ambiguity.patch
BUILD_DEP_PKGS += CSWlibwpg-dev
BUILD_DEP_PKGS += CSWpm-xml-parser
Added: csw/mgar/pkg/inkscape/trunk/files/0000-desktop-widget.cpp-resolve-overload-ambiguity.patch
===================================================================
--- csw/mgar/pkg/inkscape/trunk/files/0000-desktop-widget.cpp-resolve-overload-ambiguity.patch (rev 0)
+++ csw/mgar/pkg/inkscape/trunk/files/0000-desktop-widget.cpp-resolve-overload-ambiguity.patch 2013-11-08 20:13:58 UTC (rev 22455)
@@ -0,0 +1,43 @@
+From fc5ff3e5733f8d50be3377b670e005c974bab163 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Fri, 8 Nov 2013 19:09:09 +0100
+Subject: [PATCH] desktop-widget.cpp: resolve overload ambiguity
+
+---
+ src/widgets/desktop-widget.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
+index 5d15e00..dea2a85 100644
+--- a/src/widgets/desktop-widget.cpp
++++ b/src/widgets/desktop-widget.cpp
+@@ -489,7 +489,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
+ gtk_box_pack_end (GTK_BOX (dtw->statusbar), statusbar_tail, FALSE, FALSE, 0);
+
+ // zoom status spinbutton
+- dtw->zoom_status = gtk_spin_button_new_with_range (log(SP_DESKTOP_ZOOM_MIN)/log(2), log(SP_DESKTOP_ZOOM_MAX)/log(2), 0.1);
++ dtw->zoom_status = gtk_spin_button_new_with_range (log(SP_DESKTOP_ZOOM_MIN)/log(2.0), log(SP_DESKTOP_ZOOM_MAX)/log(2.0), 0.1);
+ gtk_tooltips_set_tip (dtw->tt, dtw->zoom_status, _("Zoom"), NULL);
+ gtk_widget_set_size_request (dtw->zoom_status, STATUS_ZOOM_WIDTH, -1);
+ gtk_entry_set_width_chars (GTK_ENTRY (dtw->zoom_status), 6);
+@@ -1601,7 +1601,7 @@ sp_dtw_zoom_value_to_display (gdouble value)
+ static gdouble
+ sp_dtw_zoom_display_to_value (gdouble value)
+ {
+- return log (value / 100.0) / log (2);
++ return log (value / 100.0) / log (2.0);
+ }
+
+ static gint
+@@ -1750,7 +1750,7 @@ void
+ sp_desktop_widget_update_zoom (SPDesktopWidget *dtw)
+ {
+ g_signal_handlers_block_by_func (G_OBJECT (dtw->zoom_status), (gpointer)G_CALLBACK (sp_dtw_zoom_value_changed), dtw);
+- gtk_spin_button_set_value (GTK_SPIN_BUTTON (dtw->zoom_status), log(dtw->desktop->current_zoom()) / log(2));
++ gtk_spin_button_set_value (GTK_SPIN_BUTTON (dtw->zoom_status), log(dtw->desktop->current_zoom()) / log(2.0));
+ gtk_widget_queue_draw(GTK_WIDGET(dtw->zoom_status));
+ if (GTK_WIDGET(dtw->zoom_status)->window)
+ gdk_window_process_updates(GTK_WIDGET(dtw->zoom_status)->window, TRUE);
+--
+1.8.4.1
+
Added: csw/mgar/pkg/inkscape/trunk/files/0000-ruler.cpp-resolved-overload-ambiguity.patch
===================================================================
--- csw/mgar/pkg/inkscape/trunk/files/0000-ruler.cpp-resolved-overload-ambiguity.patch (rev 0)
+++ csw/mgar/pkg/inkscape/trunk/files/0000-ruler.cpp-resolved-overload-ambiguity.patch 2013-11-08 20:13:58 UTC (rev 22455)
@@ -0,0 +1,25 @@
+From a35942b2e26790bbb6ad8ad2f9031f9a68ee8e65 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Fri, 8 Nov 2013 19:45:24 +0100
+Subject: [PATCH] ruler.cpp: resolved overload ambiguity
+
+---
+ src/widgets/ruler.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp
+index dd03364..0512163 100644
+--- a/src/widgets/ruler.cpp
++++ b/src/widgets/ruler.cpp
+@@ -359,7 +359,7 @@ sp_ruler_common_draw_ticks (GtkRuler *ruler)
+ (label_spacing_px > 6*digit_height || tick_index%2 == 0 || cur == 0) &&
+ (label_spacing_px > 3*digit_height || tick_index%4 == 0 || cur == 0))
+ {
+- if (fabs((int)cur) >= 2000 && (((int) cur)/1000)*1000 == ((int) cur))
++ if (fabs(cur) >= 2000 && (((int) cur)/1000)*1000 == ((int) cur))
+ sprintf (unit_str, "%dk", ((int) cur)/1000);
+ else
+ sprintf (unit_str, "%d", (int) cur);
+--
+1.8.4.1
+
Added: csw/mgar/pkg/inkscape/trunk/files/0000-tile.cpp-resolved-overload-ambiguity.patch
===================================================================
--- csw/mgar/pkg/inkscape/trunk/files/0000-tile.cpp-resolved-overload-ambiguity.patch (rev 0)
+++ csw/mgar/pkg/inkscape/trunk/files/0000-tile.cpp-resolved-overload-ambiguity.patch 2013-11-08 20:13:58 UTC (rev 22455)
@@ -0,0 +1,38 @@
+From 3350ffea792a92a02c9b2804312405622d17a896 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Fri, 8 Nov 2013 20:28:44 +0100
+Subject: [PATCH] tile.cpp: resolved overload ambiguity
+
+---
+ src/ui/dialog/tile.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
+index e615c08..c29353e 100644
+--- a/src/ui/dialog/tile.cpp
++++ b/src/ui/dialog/tile.cpp
+@@ -581,8 +581,8 @@ void TileDialog::updateSelection()
+ prefs->setInt("/dialogs/gridtiler/NoOfCols", NoOfCols);
+ }
+ } else {
+- double PerRow = ceil(sqrt(selcount));
+- double PerCol = ceil(sqrt(selcount));
++ double PerRow = ceil(sqrt(static_cast<double>(selcount)));
++ double PerCol = ceil(sqrt(static_cast<double>(selcount)));
+ NoOfRowsSpinner.set_value(PerRow);
+ NoOfColsSpinner.set_value(PerCol);
+ prefs->setInt("/dialogs/gridtiler/NoOfCols", static_cast<int>(PerCol));
+@@ -647,8 +647,8 @@ TileDialog::TileDialog()
+
+ /*#### Number of Rows ####*/
+
+- double PerRow = ceil(sqrt(selcount));
+- double PerCol = ceil(sqrt(selcount));
++ double PerRow = ceil(sqrt(static_cast<double>(selcount)));
++ double PerCol = ceil(sqrt(static_cast<double>(selcount)));
+
+ #ifdef DEBUG_GRID_ARRANGE
+ g_print("/n PerRox = %f PerCol = %f selcount = %d",PerRow,PerCol,selcount);
+--
+1.8.4.1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list