Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Update geany to 1.22 #15001

Closed
wants to merge 3 commits into from

2 participants

@gigadude

I've gotten the geany formula working from github (along with a head option), I use autogen.sh directly instead of doing autogen/configure in two steps (is that okay?)

This fixed problems with redefining keybindings on 0.21

Ed and others added some commits
Ed Upgrade geany to 0.21 to fix editor text rendering errors
The 0.20 version of geany was clipping the top few pixels of text in the editor
window under Mac OS 10.7.2 XQuartz 2.7.1_rc2 (xorg-server 1.11.4), 0.21 works
but only after a rm and full rebuild of all dependencies.
2959f8d
Ed Hutchins Merge branch 'master' of git://github.com/mxcl/homebrew
5d81d21
Ed Hutchins Switched to github and added head.
3b15c29
@adamv
Owner

Please squash to a single commit

@gigadude

I guess it does require automake/autoconf now, sorry I missed that. Should I add something like:

    depends_on :autoconf
    depends_on :automake

I've never done a rebase to squash commits (which is what I assume you mean), is there anything to worry about or should I just follow the git book?

@gigadude

Shoot, now I'm getting:

ld: unknown option: --export-dynamic

Backing out the changes (or adding --use-gcc) doesn't get it working again. Building from my personal fork of geany is still working though:

require 'formula'

class GeanyEd < Formula
  homepage 'http://geany.org/'
  url 'https://github.com/gigadude/geany/tarball/1.22.0_ed'
  sha256 '21f8e85fdcd983421265c003f42115c381d151a0b9759304d8dc89ec3902e2b2'

  depends_on :x11
  depends_on 'pkg-config' => :build
  depends_on 'gettext'
  depends_on 'intltool'
  depends_on 'gtk+'

  def install
    # Needed to compile against current version of glib.
    # Check that this is still needed when updating the formula.
    ENV.append 'LDFLAGS', '-lgmodule-2.0'

    system "./autogen.sh", "--disable-dependency-tracking",
                          "--prefix=#{prefix}"
    system "make install"
  end
end

I just merged geany's master into my fork and it still works, any idea what I've done wrong?

@gigadude

I nuked my old homebrew fork and added my changes again:

gigadude@e84ddc1

@adamv
Owner

Please reopen as a new pull request; if you make the pull request out of its own non-master branch, then you can git push -f to updated it inplace if any changes are needed.

@adamv adamv closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 9, 2012
  1. Upgrade geany to 0.21 to fix editor text rendering errors

    Ed authored
    The 0.20 version of geany was clipping the top few pixels of text in the editor
    window under Mac OS 10.7.2 XQuartz 2.7.1_rc2 (xorg-server 1.11.4), 0.21 works
    but only after a rm and full rebuild of all dependencies.
Commits on Sep 18, 2012
  1. Switched to github and added head.

    Ed Hutchins authored
This page is out of date. Refresh to see the latest.
Showing with 4 additions and 3 deletions.
  1. +4 −3 Library/Formula/geany.rb
View
7 Library/Formula/geany.rb
@@ -2,8 +2,9 @@
class Geany < Formula
homepage 'http://geany.org/'
- url 'http://download.geany.org/geany-0.21.tar.gz'
- sha256 'a1aa27d2f946ccca8a4e57faf0029cf6aa544d5d52f0170e017c137c33b4b67d'
+ url 'https://github.com/geany/geany/tarball/1.22.0'
+ head 'git://github.com/geany/geany.git', :branch => 'master'
+ sha256 '0b08d020f9e09a8756595ca9159a43785010519bf5036c7b5acbcf2d8c7e2b9e'
depends_on :x11
depends_on 'pkg-config' => :build
@@ -16,7 +17,7 @@ def install
# Check that this is still needed when updating the formula.
ENV.append 'LDFLAGS', '-lgmodule-2.0'
- system "./configure", "--disable-dependency-tracking",
+ system "./autogen.sh", "--disable-dependency-tracking",
"--prefix=#{prefix}"
system "make install"
end
Something went wrong with that request. Please try again.