Bug 190754

Summary: [MAINTAINER] x11-toolkits/scintilla & editors/scite: update to 3.4.4
Product: Ports & Packages Reporter: Naram Qashat <cyberbotx>
Component: Individual Port(s)Assignee: John Marino <marino>
Status: Closed FIXED    
Severity: Affects Only Me CC: marino, miwi
Priority: ---    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
x11-toolkits/scintilla patch
none
editors/scite patch
none
x11-toolkits/scintilla patch
none
scintilla-3.4.4.patch
none
scite-3.4.4.patch
none
scintilla-3.4.4.patch
cyberbotx: maintainer-approval+
scite-3.4.4.patch cyberbotx: maintainer-approval+

Description Naram Qashat 2014-06-07 15:55:38 UTC
Created attachment 143492 [details]
x11-toolkits/scintilla patch

- Update to 3.4.3

(I couldn't tell if Bugzilla allowed for multiple attachments at once, doesn't appear to, the editors/scite patch will be in the next reply.)
Comment 1 Naram Qashat 2014-06-07 15:56:10 UTC
Created attachment 143493 [details]
editors/scite patch

Follow-up to add editors/scite patch.
Comment 2 Naram Qashat 2014-06-07 16:59:30 UTC
Created attachment 143494 [details]
x11-toolkits/scintilla patch

Replaces the previous patch for x11-toolkits/scintilla, realized that I didn't need the compiler USES anymore.
Comment 3 Naram Qashat 2014-07-13 19:38:10 UTC
Created attachment 144639 [details]
scintilla-3.4.4.patch

Updated patch for scintilla 3.4.4
Comment 4 Naram Qashat 2014-07-13 19:38:49 UTC
Created attachment 144640 [details]
scite-3.4.4.patch

Updated patch for scite 3.4.4.
Comment 5 John Marino freebsd_committer freebsd_triage 2014-08-03 12:12:56 UTC
miwi won't be around, let somebody else take it (patch-ready)
Comment 6 John Marino freebsd_committer freebsd_triage 2014-08-07 11:37:07 UTC
ugh, besides no longer applying due to adamw changes (fixed on my end), scintilla tarball has been re-rolled

so unprofessional:
fetch: http://kaz.dl.sourceforge.net/project/scintilla/SciTE/3.4.4/scite344.tgz:
 size mismatch: expected 2244513, actual 2245870


I guess since it comes from SF, I can just regenerate the distfile.  It would be good to get some verification that this version of 3.4.4 is okay.
Comment 7 John Marino freebsd_committer freebsd_triage 2014-08-07 11:41:10 UTC
but now patch-makefile (the former patch-aa) doesn't apply cleanly.

Can you update the scintilla patch after verifying the reroll?
Comment 8 Naram Qashat 2014-08-07 12:45:28 UTC
Created attachment 145445 [details]
scintilla-3.4.4.patch

This is the updated patch for x11-toolkits/scintilla. From what I saw of the tarball, it looks like they may have prematurely released the 3.4.4 tarball as a diff between what I originally had and what was actually out there showed 3.4.3 in the version information.

As a side note, the patch for editors/scite also needs to be updated, but I will have to provide that tonight as I need to test it first.
Comment 9 John Marino freebsd_committer freebsd_triage 2014-08-07 12:48:40 UTC
do they have to be updated together?
Comment 10 Naram Qashat 2014-08-08 02:15:15 UTC
Created attachment 145498 [details]
scite-3.4.4.patch

Updating the scite patch as well now. Also need to note that files/patch-src__FilePath.h was removed, as it compiles fine without it.

In reply to the question, ideally, they should be committed together. Both share the same distfile (scintilla is actually using the scite distfile) and scite depends on scintilla.
Comment 11 John Marino freebsd_committer freebsd_triage 2014-08-08 06:07:12 UTC
I'll try to get to this tonight.
Comment 12 commit-hook freebsd_committer freebsd_triage 2014-08-08 19:48:08 UTC
A commit references this bug:

Author: marino
Date: Fri Aug  8 19:47:37 UTC 2014
New revision: 364377
URL: http://svnweb.freebsd.org/changeset/ports/364377

Log:
  scite and scintilla: Upgrade version 3.4.1 => 3.4.4

  PR:		190754
  Submitted by:	maintainer (Naram Qashat)

Changes:
  head/editors/scite/Makefile
  head/editors/scite/distinfo
  head/editors/scite/files/patch-makefile
  head/editors/scite/files/patch-src__FilePath.h
  head/x11-toolkits/scintilla/Makefile
  head/x11-toolkits/scintilla/distinfo
  head/x11-toolkits/scintilla/files/patch-makefile
Comment 13 John Marino freebsd_committer freebsd_triage 2014-08-08 19:52:03 UTC
Thanks!