Almost done packaging OSX for v3

Author: Youssef Abou-Kewik

osx/Meld

@@ -26,10 +26,7 @@ export XDG_DATA_DIRS="$bundle_data"
 export GTK_DATA_PREFIX="$bundle_res"
 export GTK_EXE_PREFIX="$bundle_res"
 export GTK_PATH="$bundle_res"
-<<<<<<< HEAD
 export GSETTINGS_SCHEMA_DIR="$bundle_res"/share/glib-2.0
-=======
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
 
 export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
 export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
@@ -80,8 +77,4 @@ if [ "x`echo "x$1" | sed -e "s/^x-psn_.*//"`" == "x" ]; then
 fi
 
 
-<<<<<<< HEAD
 $EXEC "$bundle_contents/MacOS/Meld-bin" "$@"
-=======
-$EXEC "$bundle_contents/MacOS/Meld-bin" "$@"
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b

osx/README.md

@@ -1,6 +1,6 @@
 # Meld for OS X #
 
-This README should help you build Meld for OS X. 
+This README should help you build Meld for OS X.
 
 *NOTE:* The latest OSX meld is still broken. You may want to switch to the 1.8 branch. I think I need a couple of nights to get this to work. The good new is: I can run it from within the dev environment. The bad news is: Packaging it is not a walk in the park...
 
@@ -10,16 +10,13 @@ This README should help you build Meld for OS X.
 JHBuild is the build system that we will be using to build Meld. This step should really be done once and further builds should not require updating the build environment unless there has been some updates to the libraries that you'd like to do.
 
 ---
-<<<<<<< HEAD
 #### Preparation ####
 
 To ensure that we don't hit some issue with python not able to determine locales on OSX, let's do the following
 ```
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
 ```
-=======
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
 
 #### Initial Phase ####
 
@@ -46,42 +43,30 @@ jhbuild build python
 
 4. Prepare paths and build the bootstrap
 ```
-<<<<<<< HEAD
 alias jhbuild="PATH=~/.local/bin:$PATH jhbuild"
-=======
-alias jhbuild="PATH=gtk-prefix/bin:$PATH jhbuild"
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
 jhbuild bootstrap
 ```
 
 5. Checkout meld and start the initial phase
 ```
 git clone https://github.com/yousseb/meld.git
 cd meld
-<<<<<<< HEAD
 # if building the 1.8 version, run: git checkout meld-1-8
-=======
-git checkout meld-1-8
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
 cd osx/
 ln -sf $PWD/jhbuildrc-custom ~/.jhbuildrc-custom
 cd ..
 jhbuild
 ```
 
-<<<<<<< HEAD
 6- 1.8 branch only: Fix the gtksourceview issues
-=======
-6- Fix the gtksourceview issues
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
 ```
 ln -sf ~/gtk/inst/lib/pkgconfig/gtk-mac-integration-gtk2.pc ~/gtk/inst/lib/pkgconfig/gtk-mac-integration.pc
 ```
 ```
 cp ~/Source/gtk/gtksourceview-2.10.5/tests/test-completion.c  ~/Source/gtk/gtksourceview-2.10.5/tests/test-widget.c
 ```
 Edit: ~/Source/gtk/gtksourceview-2.10.5/gtksourceview/gtksourceview-i18n.c
-Comment out: 
+Comment out:
 ```
 //if (quartz_application_get_bundle_id () != NULL)
 //{
@@ -98,19 +83,11 @@ jhbuild
 8. Build extra dependencies
 ```
 jhbuild -m osx/meld.modules build meld-python-deps
-<<<<<<< HEAD
-jhbuild run easy_install py2app
-=======
 easy_install py2app
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
 ```
 
-9. You're now ready to build Meld. 
+9. You're now ready to build Meld.
 ```
-<<<<<<< HEAD
 chmod +x osx/build_app.sh
 jhbuild run osx/build_app.sh
-=======
-bash osx/build_app.sh
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
 ```

osx/build_app.sh

@@ -6,22 +6,18 @@
 #easy_install pip
 #pip install pygtksourceview
 
-<<<<<<< HEAD
 jhbuild run python setup_py2app.py build
 jhbuild run python setup_py2app.py py2app
-=======
 
 python setup_py2app.py build
 python setup_py2app.py py2app
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
 
 APP="dist/Meld.app"
 MAIN="$APP/"
 RES="$MAIN/Contents/Resources/"
 
 mkdir -p $RES/share/icons
 cp -R ~/gtk/inst/share/icons/Tango $RES/share/icons
-<<<<<<< HEAD
 mv $RES/share/icons/Tango $RES/share/icons/Adwaita
 cp -R data/icons/* $RES/share/icons
 
@@ -35,41 +31,29 @@ cd $MAIN/Contents/MacOS
 ln -s ../Resources/share .
 popd
 
-=======
 #cp -R ~/gtk/inst/share/icons/hicolor $RES/share/icons
 cp -R data/icons/* $RES/share/icons
-
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
 mkdir -p $RES/share/themes
 cp -R ~/gtk/inst/share/themes/Clearlooks/ $RES/share/themes/Clearlooks
 cp -R ~/gtk/inst/share/themes/Mac/ $RES/share/themes/Mac
-
-<<<<<<< HEAD
 cp -R ~/gtk/inst/share/gtksourceview-3.0 $RES/share
 
 mkdir -p $RES/etc/gtk-3.0
 #mkdir -p $RES/etc/pango
 #mkdir -p $RES/etc/xdg
 cp -R osx/gtkrc $RES/etc/gtk-3.0
-=======
-cp -R ~/gtk/inst/share/gtksourceview-2.0 $RES/share
+cp -R ~/gtk/inst/share/gtksourceview-3.0 $RES/share
 
-mkdir -p $RES/etc/gtk-2.0
+mkdir -p $RES/etc/gtk-3.0
 mkdir -p $RES/etc/pango
 mkdir -p $RES/etc/xdg
-cp -R osx/gtkrc $RES/etc/gtk-2.0
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
+cp -R osx/gtkrc $RES/etc/gtk-3.0
 cp -R osx/pangorc $RES/etc/pango
 
 mkdir -p $RES/lib
-
-<<<<<<< HEAD
 #cp -R ~/gtk/inst/lib/girepository-1.0 $RES/lib
 cp -R ~/gtk/inst/lib/gtk-3.0 $RES/lib
-=======
 cp -R ~/gtk/inst/lib/girepository-1.0 $RES/lib
-cp -R ~/gtk/inst/lib/gtk-2.0 $RES/lib
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
 
 mv $MAIN/Contents/MacOS/Meld $MAIN/Contents/MacOS/Meld-bin
 cp -R osx/Meld $MAIN/Contents/MacOS

setup.cfg

@@ -1,6 +1,5 @@
 [py2app]
 app = ['bin/meld']
-<<<<<<< HEAD
 #arch = i386
 iconfile = osx/meld.icns
 site-packages = false
@@ -9,16 +8,4 @@ includes = glib, gio, cairo, pango, pangocairo, atk, gobject, gtk.keysyms
 excludes = gtk-2.0
 frameworks = CoreFoundation, Foundation, Python
 argv_emulation = True
-#resources = share/themes/Mac 
-=======
-#arch = x86_64
-#arch = i386
-iconfile = osx/meld.icns
-site-packages = false
-#packages = gi, objc
-includes = Quartz, AppKit, Cocoa, glib, gio, cairo, pango, pangocairo, atk, gobject, gtk.keysyms,
-           gtkosx_application, gtk, gtksourceview2
-#resources = share/glib-2.0, share/icons
-#frameworks = CoreFoundation, Foundation, AppKit, libz.1.2.7.dylib
-argv_emulation = True
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
+#resources = share/themes/Mac

setup_py2app.py

@@ -24,18 +24,10 @@
 
 PLIST = {
     'CFBundleDocumentTypes': [
-<<<<<<< HEAD
         {
             'CFBundleTypeExtensions': ['scmdifftool'],
             'CFBundleTypeIconFile': 'DiffToolDocument',
             'CFBundleTypeName': 'Diff Tool',
-=======
-        # Associate application with .xyz files
-        {
-            #'CFBundleTypeExtensions': ['xyz'],
-            #'CFBundleTypeIconFile': 'xyz.icns',
-            #'CFBundleTypeName': 'XYZ Project',
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
             'CFBundleTypeRole': 'Editor',
             'LSTypeIsPackage': True,
         },
@@ -45,11 +37,7 @@
     'CFBundleSignature': '???',
     'CFBundleVersion': VERSION_STRING,
     'LSPrefersPPC': FORCE_32_BIT,
-<<<<<<< HEAD
     'NSHumanReadableCopyright': u'Copyright © 205',
-=======
-    'NSHumanReadableCopyright': u'Copyright © 2014',
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
     'CFBundleDisplayName': 'Meld',
     'CFBundleName': 'Meld',
     'NSHighResolutionCapable': True,
@@ -104,11 +92,7 @@
          ['COPYING', 'NEWS']
          ),
         ('share/meld',
-<<<<<<< HEAD
          ['data/gschemas.compiled']
-=======
-         ['data/gtkrc']
->>>>>>> da87c5c4fffb10614d606301de670c7807f1f69b
          ),
         ('share/meld/icons',
          glob.glob("data/icons/*.png") +