Date: Saturday, August 4, 2012 @ 06:57:11
Author: andyrtr
Revision: 164738
upgpkg: monodevelop 3.0.3.5-2
try to fix Gettext Addin location in pkgconfig file to make gdb pkg compile
Added:
monodevelop/trunk/monodevelop-core-addins.pc.in.patch
Modified:
monodevelop/trunk/PKGBUILD
monodevelop/trunk/monodevelop.install
Deleted:
monodevelop/trunk/monodevelop_gnome3.patch
-------------------------------------+
PKGBUILD | 11 ++-
monodevelop-core-addins.pc.in.patch | 8 ++
monodevelop.install | 1
monodevelop_gnome3.patch | 101 ----------------------------------
4 files changed, 17 insertions(+), 104 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-08-04 10:47:06 UTC (rev 164737)
+++ PKGBUILD 2012-08-04 10:57:11 UTC (rev 164738)
@@ -5,7 +5,7 @@
pkgname=monodevelop
pkgver=3.0.3.5
-pkgrel=1
+pkgrel=2
pkgdesc="An IDE primarily designed for C# and other .NET languages"
# should probably changed to "any" - no ELF files - OpenSUSE builds it as
NOARCH
@@ -16,14 +16,19 @@
depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp'
'desktop-file-utils' 'hicolor-icon-theme')
options=(!makeflags)
install=monodevelop.install
-source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ca46b77b49266112b63a8f5c451c5565')
+source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+ monodevelop-core-addins.pc.in.patch)
+md5sums=('ca46b77b49266112b63a8f5c451c5565'
+ '8466d032735130e37d4091a793a7966c')
build() {
export MONO_SHARED_DIR=$srcdir/src/.wabi
mkdir -p $MONO_SHARED_DIR
cd $srcdir/$pkgname-$pkgver
+ # fix location for MonoDevelop.Gettext.dll - breaks gdb build
+ patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch
+
./configure --prefix=/usr --disable-update-mimedb --disable-update-desktopdb
LD_PRELOAD="" make
}
Added: monodevelop-core-addins.pc.in.patch
===================================================================
--- monodevelop-core-addins.pc.in.patch (rev 0)
+++ monodevelop-core-addins.pc.in.patch 2012-08-04 10:57:11 UTC (rev 164738)
@@ -0,0 +1,8 @@
+--- monodevelop-core-addins.pc.in 2012-07-27 21:33:41.000000000 +0200
++++ monodevelop-core-addins.pc.in.new 2012-08-04 12:42:36.086516667 +0200
+@@ -6,4 +6,4 @@
+ Name: MonoDevelop Core Add-ins
+ Description: MonoDevelop Core Add-ins
+ Version: @VERSION@
+-Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll
-r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll
-r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll
-r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll
-r:${libdir}/AddIns/DisplayBindings/Gettext/MonoDevelop.Gettext.dll
-r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll
-r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll
-r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll
-r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll
-r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll
-r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll
-r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll
-r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll
-r:${libdir}/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll
-r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDeve
lop.Debugger.dll
-r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll
-r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll
-r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll
-r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll
++Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll
-r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll
-r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll
-r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll
-r:${libdir}/AddIns/DisplayBindings/MonoDevelop.Gettext/MonoDevelop.Gettext.dll
-r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll
-r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll
-r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll
-r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll
-r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll
-r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll
-r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll
-r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll
-r:${libdir}/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll
-r:${libdir}/AddIns/MonoDevelop.Debug
ger/MonoDevelop.Debugger.dll
-r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll
-r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll
-r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll
-r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll
Modified: monodevelop.install
===================================================================
--- monodevelop.install 2012-08-04 10:47:06 UTC (rev 164737)
+++ monodevelop.install 2012-08-04 10:57:11 UTC (rev 164738)
@@ -2,6 +2,7 @@
update-mime-database /usr/share/mime 1> /dev/null
echo "update desktop mime database..."
update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
post_upgrade() {
Deleted: monodevelop_gnome3.patch
===================================================================
--- monodevelop_gnome3.patch 2012-08-04 10:47:06 UTC (rev 164737)
+++ monodevelop_gnome3.patch 2012-08-04 10:57:11 UTC (rev 164738)
@@ -1,101 +0,0 @@
-diff --git a/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs
b/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs
-index 4d8954c..e1a1937 100644
---- a/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs
-+++ b/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs
-@@ -1,5 +1,6 @@
- using System;
- using System.Collections;
-+using System.Collections.Generic;
-
- namespace Stetic.Wrapper {
- public abstract class Object : Stetic.ObjectWrapper {
-@@ -11,17 +12,32 @@ namespace Stetic.Wrapper {
- ((GLib.Object)Wrapped).RemoveNotification
(NotifyHandler);
- base.Dispose ();
- }
--
-+
-+ IEnumerable<string> GladePropertyNames {
-+ get {
-+ foreach (ItemGroup group in
ClassDescriptor.ItemGroups) {
-+ foreach (ItemDescriptor item in group) {
-+ TypedPropertyDescriptor prop =
item as TypedPropertyDescriptor;
-+ if (prop != null &&
!string.IsNullOrEmpty (prop.GladeName)) {
-+ yield return
prop.GladeName;
-+ }
-+ }
-+ }
-+ }
-+ }
-+
- internal protected override void OnDesignerAttach (IDesignArea
designer)
- {
- base.OnDesignerAttach (designer);
-- ((GLib.Object)Wrapped).AddNotification (NotifyHandler);
-+ foreach (string property in GladePropertyNames)
-+ ((GLib.Object)Wrapped).AddNotification
(property, NotifyHandler);
- }
-
- internal protected override void OnDesignerDetach (IDesignArea
designer)
- {
- base.OnDesignerDetach (designer);
-- ((GLib.Object)Wrapped).RemoveNotification
(NotifyHandler);
-+ foreach (string property in GladePropertyNames)
-+ ((GLib.Object)Wrapped).RemoveNotification
(property, NotifyHandler);
- }
-
- public static Object Lookup (GLib.Object obj)
-
-diff --git
a/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
b/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
-index 89f04b5..75d7b17 100644
----
a/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
-+++
b/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
-@@ -1540,22 +1540,39 @@ namespace MonoDevelop.Components.Commands
- internal class ToolbarTracker
- {
- Gtk.IconSize lastSize;
--
-+
- public void Track (Gtk.Toolbar toolbar)
- {
- lastSize = toolbar.IconSize;
-- toolbar.AddNotification (OnToolbarPropChanged);
-+ toolbar.AddNotification ("icon-size", IconSizeChanged);
-+ toolbar.OrientationChanged +=
HandleToolbarOrientationChanged;
-+ toolbar.StyleChanged += HandleToolbarStyleChanged;
-+
- toolbar.Destroyed += delegate {
-- toolbar.RemoveNotification
(OnToolbarPropChanged);
-+ toolbar.StyleChanged -=
HandleToolbarStyleChanged;
-+ toolbar.OrientationChanged -=
HandleToolbarOrientationChanged;
-+ toolbar.RemoveNotification ("icon-size",
IconSizeChanged);
- };
- }
--
-- void OnToolbarPropChanged (object ob, GLib.NotifyArgs args)
-+
-+ void HandleToolbarStyleChanged (object o, Gtk.StyleChangedArgs
args)
- {
-- Gtk.Toolbar t = (Gtk.Toolbar) ob;
-- if (lastSize != t.IconSize || args.Property ==
"orientation" || args.Property == "toolbar-style")
-+ Gtk.Toolbar t = (Gtk.Toolbar) o;
-+ if (lastSize != t.IconSize)
- UpdateCustomItems (t);
-- lastSize = t.IconSize;
-+ }
-+
-+ void HandleToolbarOrientationChanged (object o,
Gtk.OrientationChangedArgs args)
-+ {
-+ Gtk.Toolbar t = (Gtk.Toolbar) o;
-+ if (lastSize != t.IconSize)
-+ UpdateCustomItems (t);
-+ }
-+
-+ void IconSizeChanged (object o, GLib.NotifyArgs args)
-+ {
-+ this.lastSize = ((Gtk.Toolbar) o).IconSize;
-+ UpdateCustomItems ((Gtk.Toolbar) o);
- }
-
- void UpdateCustomItems (Gtk.Toolbar t)
-
